Fix build

aws · May 13, 2023 · 55212ec · 55212ec
1 parent 9e6c984
commit 55212ec
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 53 deletions.
diff --git a/....bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.assets.json b/....bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "cb267e160f79b2563def1b9598861ff776d6cbc224d66c0a736c26a5ae9f21cc": {
+    "6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744": {
       "source": {
         "path": "aws-cdk-s3-access-logs-sse-kms.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "cb267e160f79b2563def1b9598861ff776d6cbc224d66c0a736c26a5ae9f21cc.json",
+          "objectKey": "6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.template.json b/...ucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.template.json
@@ -1,6 +1,6 @@
 {
  "Resources": {
-  "MyAccessLogsBucketKeyBAFD8B1E": {
+  "ServerAccessLogsBucketKey95B7E326": {
    "Type": "AWS::KMS::Key",
    "Properties": {
     "KeyPolicy": {
@@ -44,12 +44,12 @@
      ],
      "Version": "2012-10-17"
     },
-    "Description": "Created by aws-cdk-s3-access-logs-sse-kms/MyAccessLogsBucket"
+    "Description": "Created by aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket"
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
   },
-  "MyAccessLogsBucketF7FE6635": {
+  "ServerAccessLogsBucket05F29982": {
    "Type": "AWS::S3::Bucket",
    "Properties": {
     "BucketEncryption": {
@@ -58,7 +58,7 @@
        "ServerSideEncryptionByDefault": {
         "KMSMasterKeyID": {
          "Fn::GetAtt": [
-          "MyAccessLogsBucketKeyBAFD8B1E",
+          "ServerAccessLogsBucketKey95B7E326",
           "Arn"
          ]
         },
@@ -77,11 +77,11 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
-  "MyAccessLogsBucketPolicyEA9AB063": {
+  "ServerAccessLogsBucketPolicy947BE3EE": {
    "Type": "AWS::S3::BucketPolicy",
    "Properties": {
     "Bucket": {
-     "Ref": "MyAccessLogsBucketF7FE6635"
+     "Ref": "ServerAccessLogsBucket05F29982"
     },
     "PolicyDocument": {
      "Statement": [
@@ -103,7 +103,7 @@
        "Resource": [
         {
          "Fn::GetAtt": [
-          "MyAccessLogsBucketF7FE6635",
+          "ServerAccessLogsBucket05F29982",
           "Arn"
          ]
         },
@@ -113,7 +113,7 @@
           [
            {
             "Fn::GetAtt": [
-             "MyAccessLogsBucketF7FE6635",
+             "ServerAccessLogsBucket05F29982",
              "Arn"
             ]
            },
@@ -129,7 +129,7 @@
         "ArnLike": {
          "aws:SourceArn": {
           "Fn::GetAtt": [
-           "MyBucketF68F3FF0",
+           "Bucket83908E77",
            "Arn"
           ]
          }
@@ -150,7 +150,7 @@
          [
           {
            "Fn::GetAtt": [
-            "MyAccessLogsBucketF7FE6635",
+            "ServerAccessLogsBucket05F29982",
             "Arn"
            ]
           },
@@ -164,7 +164,7 @@
     }
    }
   },
-  "MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E": {
+  "ServerAccessLogsBucketAutoDeleteObjectsCustomResourceDA32BBFB": {
    "Type": "Custom::S3AutoDeleteObjects",
    "Properties": {
     "ServiceToken": {
@@ -174,11 +174,11 @@
      ]
     },
     "BucketName": {
-     "Ref": "MyAccessLogsBucketF7FE6635"
+     "Ref": "ServerAccessLogsBucket05F29982"
     }
    },
    "DependsOn": [
-    "MyAccessLogsBucketPolicyEA9AB063"
+    "ServerAccessLogsBucketPolicy947BE3EE"
    ],
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -230,7 +230,7 @@
       [
        "Lambda function for auto-deleting objects in ",
        {
-        "Ref": "MyAccessLogsBucketF7FE6635"
+        "Ref": "ServerAccessLogsBucket05F29982"
        },
        " S3 bucket."
       ]
@@ -241,12 +241,12 @@
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
    ]
   },
-  "MyBucketF68F3FF0": {
+  "Bucket83908E77": {
    "Type": "AWS::S3::Bucket",
    "Properties": {
     "LoggingConfiguration": {
      "DestinationBucketName": {
-      "Ref": "MyAccessLogsBucketF7FE6635"
+      "Ref": "ServerAccessLogsBucket05F29982"
      },
      "LogFilePrefix": "example"
     }

diff --git a/...-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json b/...-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "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}/cb267e160f79b2563def1b9598861ff776d6cbc224d66c0a736c26a5ae9f21cc.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -33,28 +33,28 @@
         "aws-cdk-s3-access-logs-sse-kms.assets"
       ],
       "metadata": {
-        "/aws-cdk-s3-access-logs-sse-kms/MyAccessLogsBucket/Key/Resource": [
+        "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "MyAccessLogsBucketKeyBAFD8B1E"
+            "data": "ServerAccessLogsBucketKey95B7E326"
           }
         ],
-        "/aws-cdk-s3-access-logs-sse-kms/MyAccessLogsBucket/Resource": [
+        "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "MyAccessLogsBucketF7FE6635"
+            "data": "ServerAccessLogsBucket05F29982"
           }
         ],
-        "/aws-cdk-s3-access-logs-sse-kms/MyAccessLogsBucket/Policy/Resource": [
+        "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "MyAccessLogsBucketPolicyEA9AB063"
+            "data": "ServerAccessLogsBucketPolicy947BE3EE"
           }
         ],
-        "/aws-cdk-s3-access-logs-sse-kms/MyAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [
+        "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E"
+            "data": "ServerAccessLogsBucketAutoDeleteObjectsCustomResourceDA32BBFB"
           }
         ],
         "/aws-cdk-s3-access-logs-sse-kms/DefaultCrNodeVersionMap": [
@@ -75,10 +75,10 @@
             "data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F"
           }
         ],
-        "/aws-cdk-s3-access-logs-sse-kms/MyBucket/Resource": [
+        "/aws-cdk-s3-access-logs-sse-kms/Bucket/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "MyBucketF68F3FF0"
+            "data": "Bucket83908E77"
           }
         ],
         "/aws-cdk-s3-access-logs-sse-kms/BootstrapVersion": [
@@ -92,6 +92,51 @@
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
+        ],
+        "MyAccessLogsBucketKeyBAFD8B1E": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyAccessLogsBucketKeyBAFD8B1E",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
+        ],
+        "MyAccessLogsBucketF7FE6635": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyAccessLogsBucketF7FE6635",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
+        ],
+        "MyAccessLogsBucketPolicyEA9AB063": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyAccessLogsBucketPolicyEA9AB063",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
+        ],
+        "MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
+        ],
+        "MyBucketF68F3FF0": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyBucketF68F3FF0",
+            "trace": [
+              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+            ]
+          }
         ]
       },
       "displayName": "aws-cdk-s3-access-logs-sse-kms"