skip: Merge pull request #104 from epam/feature/policy_update

upd: updated policies 272, 283, 310, 461, 497, 508
epam · Jan 23, 2024 · 2cda389 · 2cda389
2 parents 50a6dd3 + a1f8c6a
commit 2cda389
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 24 deletions.
diff --git a/policies/ecc-aws-272-elasticache_latest_version.yml b/policies/ecc-aws-272-elasticache_latest_version.yml
@@ -20,12 +20,13 @@ policies:
                     value: memcached
                   - type: value
                     key: EngineVersion
-                    value: "1.6.17"
+                    op: regex
+                    value: '1.6.*'
               - and:
                   - type: value
                     key: Engine
                     value: redis
                   - type: value
                     key: EngineVersion
                     op: regex
-                    value: '7.0.*'
+                    value: '7.1.*'
diff --git a/policies/ecc-aws-283-elasticsearch_latest_version.yml b/policies/ecc-aws-283-elasticsearch_latest_version.yml
@@ -15,4 +15,4 @@ policies:
       - not:
           - type: value
             key: ElasticsearchVersion
-            value: 'OpenSearch_2.9'
+            value: 'OpenSearch_2.11'
diff --git a/policies/ecc-aws-310-dms_latest_version.yml b/policies/ecc-aws-310-dms_latest_version.yml
@@ -15,4 +15,4 @@ policies:
       - not:
           - type: value
             key: EngineVersion
-            value: '3.5.1'
+            value: '3.5.2'
diff --git a/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml b/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml
@@ -19,4 +19,4 @@ policies:
           - type: value
             key: Runtime
             op: regex
-            value: '(nodejs18.x|python3.11|java17|dotnetcore3.1|dotnet6|go1.x|ruby3.2)'
+            value: '(nodejs20.x|python3.12|java21|dotnetcore3.1|dotnet6|go1.x|ruby3.2)'
diff --git a/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml b/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml
@@ -14,5 +14,5 @@ policies:
     filters:
       - type: value
         key: version
-        value: "1.21"
+        value: "1.23"
         op: lt
diff --git a/policies/ecc-aws-508-mwaa_latest_version.yml b/policies/ecc-aws-508-mwaa_latest_version.yml
@@ -15,4 +15,4 @@ policies:
       - not:
           - type: value
             key: AirflowVersion
-            value: '2.6.3'
+            value: '2.7.2'
diff --git a/terraform/ecc-aws-272-elasticache_latest_version/red/elasticache.tf b/terraform/ecc-aws-272-elasticache_latest_version/red/elasticache.tf
@@ -1,7 +1,7 @@
 resource "aws_elasticache_cluster" "redis" {
   cluster_id               = "c7n-272-elasticache-redis-cluster-red"
   engine                   = "redis"
-  engine_version           = "5.0.6"
+  engine_version           = "7.0"
   node_type                = "cache.t2.micro"
   num_cache_nodes          = 1
   port                     = 6379
@@ -14,4 +14,4 @@ resource "aws_elasticache_cluster" "memcached" {
   node_type                = "cache.t2.micro"
   num_cache_nodes          = 1
   port                     = 11211
-}
+}
diff --git a/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf b/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf
@@ -1,6 +1,6 @@
 resource "aws_elasticsearch_domain" "this" {
   domain_name           = "elasticsearch-283-green"
-  elasticsearch_version = "OpenSearch_2.9"
+  elasticsearch_version = "OpenSearch_2.11"
 
   ebs_options {
     ebs_enabled = true

diff --git a/terraform/ecc-aws-310-dms_latest_version/green/dms.tf b/terraform/ecc-aws-310-dms_latest_version/green/dms.tf
@@ -4,7 +4,7 @@ resource "aws_dms_replication_instance" "this" {
   publicly_accessible          = false
   replication_instance_class   = "dms.t2.micro"
   replication_instance_id      = "dms-replication-instance-310-green"
-  engine_version               = "3.5.1"
+  engine_version               = "3.5.2"
   depends_on = [
     null_resource.this
   ]

diff --git a/terraform/ecc-aws-310-dms_latest_version/red/dms.tf b/terraform/ecc-aws-310-dms_latest_version/red/dms.tf
@@ -3,7 +3,7 @@ resource "aws_dms_replication_instance" "this" {
   apply_immediately          = true
   availability_zone          = "us-east-1c"
   publicly_accessible        = false
-  engine_version             = "3.4.2"
+  engine_version             = "3.5.1"
   replication_instance_class = "dms.t2.micro"
   replication_instance_id    = "dms-replication-instance-310-red"
 

diff --git a/terraform/ecc-aws-461-lambda_latest_runtime_environment_version/green/lambda.tf b/terraform/ecc-aws-461-lambda_latest_runtime_environment_version/green/lambda.tf
@@ -47,5 +47,5 @@ resource "aws_lambda_function" "this" {
   function_name = "461_lambda_green"
   role          = aws_iam_role.this.arn
   handler       = "func.py"
-  runtime       = "python3.11"
+  runtime       = "python3.12"
 }
diff --git a/...aws-272-elasticache_latest_version/placebo-green/elasticache.DescribeCacheClusters_1.json b/...aws-272-elasticache_latest_version/placebo-green/elasticache.DescribeCacheClusters_1.json
@@ -11,7 +11,7 @@
                 "ClientDownloadLandingPage": "https://console.aws.amazon.com/elasticache/home#client-download:",
                 "CacheNodeType": "cache.t2.micro",
                 "Engine": "memcached",
-                "EngineVersion": "1.6.17",
+                "EngineVersion": "1.6.22",
                 "CacheClusterStatus": "available",
                 "NumCacheNodes": 1,
                 "PreferredAvailabilityZone": "us-east-1a",
@@ -47,7 +47,7 @@
                 "ClientDownloadLandingPage": "https://console.aws.amazon.com/elasticache/home#client-download:",
                 "CacheNodeType": "cache.t2.micro",
                 "Engine": "redis",
-                "EngineVersion": "7.0.7",
+                "EngineVersion": "7.1.0",
                 "CacheClusterStatus": "available",
                 "NumCacheNodes": 1,
                 "PreferredAvailabilityZone": "us-east-1f",

diff --git a/...c-aws-272-elasticache_latest_version/placebo-red/elasticache.DescribeCacheClusters_1.json b/...c-aws-272-elasticache_latest_version/placebo-red/elasticache.DescribeCacheClusters_1.json
@@ -47,7 +47,7 @@
                 "ClientDownloadLandingPage": "https://console.aws.amazon.com/elasticache/home#client-download:",
                 "CacheNodeType": "cache.t2.micro",
                 "Engine": "redis",
-                "EngineVersion": "5.0.6",
+                "EngineVersion": "7.0.7",
                 "CacheClusterStatus": "available",
                 "NumCacheNodes": 1,
                 "PreferredAvailabilityZone": "us-east-1f",

diff --git a/tests/ecc-aws-272-elasticache_latest_version/red_policy_test.py b/tests/ecc-aws-272-elasticache_latest_version/red_policy_test.py
@@ -3,4 +3,4 @@ class PolicyTest(object):
     def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 2)
         base_test.assertIn(resources[0]['Engine'], ("redis", "memcached"))
-        base_test.assertIn(resources[0]['EngineVersion'], ("5.0.6", "1.5.16"))
+        base_test.assertIn(resources[0]['EngineVersion'], ("7.0.7", "1.5.16"))
diff --git a/...aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json b/...aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json
@@ -12,7 +12,7 @@
                 "Endpoint": "search-elasticsearch-283-green-sqrl5fumngl6zniiccpgcym4py.us-east-1.es.amazonaws.com",
                 "Processing": false,
                 "UpgradeProcessing": false,
-                "ElasticsearchVersion": "OpenSearch_2.9",
+                "ElasticsearchVersion": "OpenSearch_2.11",
                 "ElasticsearchClusterConfig": {
                     "InstanceType": "m4.large.elasticsearch",
                     "InstanceCount": 1,

diff --git a/tests/ecc-aws-310-dms_latest_version/placebo-green/dms.DescribeReplicationInstances_1.json b/tests/ecc-aws-310-dms_latest_version/placebo-green/dms.DescribeReplicationInstances_1.json
@@ -77,7 +77,7 @@
                 "PreferredMaintenanceWindow": "sat:13:07-sat:13:37",
                 "PendingModifiedValues": {},
                 "MultiAZ": false,
-                "EngineVersion": "3.5.1",
+                "EngineVersion": "3.5.2",
                 "AutoMinorVersionUpgrade": false,
                 "KmsKeyId": "arn:aws:kms:us-east-1:111111111111:key/e56f2d19-2ba5-4c25-829a-44ad8f133131",
                 "ReplicationInstanceArn": "arn:aws:dms:us-east-1:111111111111:rep:UM3S7JB7K5M7NGHUWRC3JIOIG3IS2Y2O2R24FYA",

diff --git a/tests/ecc-aws-310-dms_latest_version/placebo-red/dms.DescribeReplicationInstances_1.json b/tests/ecc-aws-310-dms_latest_version/placebo-red/dms.DescribeReplicationInstances_1.json
@@ -77,7 +77,7 @@
                 "PreferredMaintenanceWindow": "fri:10:42-fri:11:12",
                 "PendingModifiedValues": {},
                 "MultiAZ": false,
-                "EngineVersion": "3.4.2",
+                "EngineVersion": "3.5.1",
                 "AutoMinorVersionUpgrade": false,
                 "KmsKeyId": "arn:aws:kms:us-east-1:111111111111:key/e56f2d19-2ba5-4c25-829a-44ad8f133131",
                 "ReplicationInstanceArn": "arn:aws:dms:us-east-1:111111111111:rep:K66KNPLYAMBNS3VGY5D5IPEZB7TRIKBOFHREJSQ",

diff --git a/tests/ecc-aws-310-dms_latest_version/red_policy_test.py b/tests/ecc-aws-310-dms_latest_version/red_policy_test.py
@@ -2,4 +2,4 @@ class PolicyTest(object):
 
      def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertEqual(resources[0]['EngineVersion'], '3.4.2')
+        base_test.assertEqual(resources[0]['EngineVersion'], '3.5.1')
diff --git a/...s-461-lambda_latest_runtime_environment_version/placebo-green/lambda.ListFunctions_1.json b/...s-461-lambda_latest_runtime_environment_version/placebo-green/lambda.ListFunctions_1.json
@@ -6,7 +6,7 @@
             {
                 "FunctionName": "461_lambda_green",
                 "FunctionArn": "arn:aws:lambda:us-east-1:111111111111:function:461_lambda_green",
-                "Runtime": "python3.11",
+                "Runtime": "python3.12",
                 "Role": "arn:aws:iam::111111111111:role/461_role_green",
                 "Handler": "func.py",
                 "CodeSize": 299,

diff --git a/...ecc-aws-497-eks_cluster_oldest_supported_version/placebo-green/eks.DescribeCluster_1.json b/...ecc-aws-497-eks_cluster_oldest_supported_version/placebo-green/eks.DescribeCluster_1.json
@@ -15,7 +15,7 @@
                 "second": 28,
                 "microsecond": 144000
             },
-            "version": "1.23",
+            "version": "1.28",
             "endpoint": "https://FB018462E830092FF71292F940D1E94B.gr7.us-east-1.eks.amazonaws.com",
             "roleArn": "arn:aws:iam::111111111111:role/eks-497-cluster-green",
             "resourcesVpcConfig": {

diff --git a/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json b/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json
@@ -7,7 +7,7 @@
                 "core.default_task_retries": "16",
                 "core.parallelism": "1"
             },
-            "AirflowVersion": "2.6.3",
+            "AirflowVersion": "2.7.2",
             "Arn": "arn:aws:airflow:us-east-1:111111111111:environment/mwaa_508_green",
             "CreatedAt": {
                 "__class__": "datetime",