change codes and integ

go-to-k · Sep 27, 2023 · 5fddc2b · 5fddc2b
1 parent c7d5edf
commit 5fddc2b
Show file tree

Hide file tree

Showing 6 changed files with 375 additions and 287 deletions.
diff --git a/...st/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.assets.json b/...st/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.assets.json
@@ -27,15 +27,15 @@
         }
       }
     },
-    "6efada41383a47bd56eb0a2e6091955fbf170a468c599d5b34732bcd1ba263d9": {
+    "4301c174291c4477deacb211946eadbb7f6831bd12fa06731627ec20fa341809": {
       "source": {
         "path": "cdk-integ-cluster-snapshot.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "6efada41383a47bd56eb0a2e6091955fbf170a468c599d5b34732bcd1ba263d9.json",
+          "objectKey": "4301c174291c4477deacb211946eadbb7f6831bd12fa06731627ec20fa341809.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/.../aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json b/.../aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json
@@ -431,7 +431,7 @@
      "Ref": "ClusterSubnetsDCFA5CB7"
     },
     "Engine": "aurora-mysql",
-    "EngineVersion": "5.7.mysql_aurora.2.10.2",
+    "EngineVersion": "5.7.mysql_aurora.2.11.3",
     "MasterUserPassword": {
      "Fn::Join": [
       "",
@@ -1230,6 +1230,22 @@
          ]
         }
        ]
+      },
+      {
+       "Action": [
+        "logs:CreateLogDelivery",
+        "logs:CreateLogStream",
+        "logs:DeleteLogDelivery",
+        "logs:DescribeLogGroups",
+        "logs:DescribeResourcePolicies",
+        "logs:GetLogDelivery",
+        "logs:ListLogDeliveries",
+        "logs:PutLogEvents",
+        "logs:PutResourcePolicy",
+        "logs:UpdateLogDelivery"
+       ],
+       "Effect": "Allow",
+       "Resource": "*"
       }
      ],
      "Version": "2012-10-17"
@@ -1242,6 +1258,14 @@
     ]
    }
   },
+  "SnapshoterSnapshotProviderwaiterstatemachineLogGroup5A64CAF9": {
+   "Type": "AWS::Logs::LogGroup",
+   "Properties": {
+    "RetentionInDays": 1
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
   "SnapshoterSnapshotProviderwaiterstatemachineE1F05D1F": {
    "Type": "AWS::StepFunctions::StateMachine",
    "Properties": {
@@ -1272,6 +1296,22 @@
       "SnapshoterSnapshotProviderwaiterstatemachineRole76E414C5",
       "Arn"
      ]
+    },
+    "LoggingConfiguration": {
+     "Destinations": [
+      {
+       "CloudWatchLogsLogGroup": {
+        "LogGroupArn": {
+         "Fn::GetAtt": [
+          "SnapshoterSnapshotProviderwaiterstatemachineLogGroup5A64CAF9",
+          "Arn"
+         ]
+        }
+       }
+      }
+     ],
+     "IncludeExecutionData": false,
+     "Level": "ERROR"
     }
    },
    "DependsOn": [
@@ -1491,7 +1531,7 @@
      "Ref": "FromSnapshotSubnets9ED4B8EE"
     },
     "Engine": "aurora-mysql",
-    "EngineVersion": "5.7.mysql_aurora.2.10.2",
+    "EngineVersion": "5.7.mysql_aurora.2.11.3",
     "MasterUserPassword": {
      "Fn::Join": [
       "",

diff --git a/...esting/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/manifest.json b/...esting/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/manifest.json
@@ -14,10 +14,11 @@
       "environment": "aws://unknown-account/unknown-region",
       "properties": {
         "templateFile": "cdk-integ-cluster-snapshot.template.json",
+        "terminationProtection": false,
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6efada41383a47bd56eb0a2e6091955fbf170a468c599d5b34732bcd1ba263d9.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4301c174291c4477deacb211946eadbb7f6831bd12fa06731627ec20fa341809.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -303,6 +304,12 @@
             "data": "SnapshoterSnapshotProviderwaiterstatemachineRoleDefaultPolicyCF7716B2"
           }
         ],
+        "/cdk-integ-cluster-snapshot/Snapshoter/SnapshotProvider/waiter-state-machine/LogGroup/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "SnapshoterSnapshotProviderwaiterstatemachineLogGroup5A64CAF9"
+          }
+        ],
         "/cdk-integ-cluster-snapshot/Snapshoter/SnapshotProvider/waiter-state-machine/Resource": [
           {
             "type": "aws:cdk:logicalId",
@@ -433,6 +440,7 @@
       "environment": "aws://unknown-account/unknown-region",
       "properties": {
         "templateFile": "ClusterSnapshotIntegDefaultTestDeployAssert647D4685.template.json",
+        "terminationProtection": false,
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",