From db6508c41e783a9baa3106bca1b4d4ae8951e80f Mon Sep 17 00:00:00 2001 From: Dongfang Zhao Date: Sun, 7 May 2023 20:05:49 -0700 Subject: [PATCH] Fix build one more time --- ...s3-server-access-logs-sse-kms.assets.json} | 6 +- ...-server-access-logs-sse-kms.template.json} | 2 +- .../integ.json | 2 +- .../manifest.json | 81 +++++-------------- .../tree.json | 42 +++++----- 5 files changed, 44 insertions(+), 89 deletions(-) rename packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/{aws-cdk-s3-access-logs-sse-kms.assets.json => aws-cdk-s3-server-access-logs-sse-kms.assets.json} (81%) rename packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/{aws-cdk-s3-access-logs-sse-kms.template.json => aws-cdk-s3-server-access-logs-sse-kms.template.json} (98%) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.assets.json similarity index 81% rename from packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.assets.json index 29129fe7a350c..1b2f22aa6da67 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.assets.json @@ -14,15 +14,15 @@ } } }, - "6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744": { + "a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199": { "source": { - "path": "aws-cdk-s3-access-logs-sse-kms.template.json", + "path": "aws-cdk-s3-server-access-logs-sse-kms.template.json", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json", + "objectKey": "a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.template.json similarity index 98% rename from packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.template.json index 931d8d1ef34f4..afb92ede77d02 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-access-logs-sse-kms.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/aws-cdk-s3-server-access-logs-sse-kms.template.json @@ -44,7 +44,7 @@ ], "Version": "2012-10-17" }, - "Description": "Created by aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket" + "Description": "Created by aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket" }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/integ.json index a66946c34e14a..13e49a9e69d4c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/integ.json @@ -3,7 +3,7 @@ "testCases": { "ServerAccessLogsSseKmsTest/DefaultTest": { "stacks": [ - "aws-cdk-s3-access-logs-sse-kms" + "aws-cdk-s3-server-access-logs-sse-kms" ], "assertionStack": "ServerAccessLogsSseKmsTest/DefaultTest/DeployAssert", "assertionStackName": "ServerAccessLogsSseKmsTestDefaultTestDeployAssertB937C102" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json index 6b647d1f77ef8..a7977003d35e7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json @@ -1,27 +1,27 @@ { "version": "31.0.0", "artifacts": { - "aws-cdk-s3-access-logs-sse-kms.assets": { + "aws-cdk-s3-server-access-logs-sse-kms.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "aws-cdk-s3-access-logs-sse-kms.assets.json", + "file": "aws-cdk-s3-server-access-logs-sse-kms.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "aws-cdk-s3-access-logs-sse-kms": { + "aws-cdk-s3-server-access-logs-sse-kms": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "aws-cdk-s3-access-logs-sse-kms.template.json", + "templateFile": "aws-cdk-s3-server-access-logs-sse-kms.template.json", "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}/6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "aws-cdk-s3-access-logs-sse-kms.assets" + "aws-cdk-s3-server-access-logs-sse-kms.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -30,116 +30,71 @@ } }, "dependencies": [ - "aws-cdk-s3-access-logs-sse-kms.assets" + "aws-cdk-s3-server-access-logs-sse-kms.assets" ], "metadata": { - "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource": [ + "/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource": [ { "type": "aws:cdk:logicalId", "data": "ServerAccessLogsBucketKey95B7E326" } ], - "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Resource": [ + "/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Resource": [ { "type": "aws:cdk:logicalId", "data": "ServerAccessLogsBucket05F29982" } ], - "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource": [ + "/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource": [ { "type": "aws:cdk:logicalId", "data": "ServerAccessLogsBucketPolicy947BE3EE" } ], - "/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [ + "/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [ { "type": "aws:cdk:logicalId", "data": "ServerAccessLogsBucketAutoDeleteObjectsCustomResourceDA32BBFB" } ], - "/aws-cdk-s3-access-logs-sse-kms/DefaultCrNodeVersionMap": [ + "/aws-cdk-s3-server-access-logs-sse-kms/DefaultCrNodeVersionMap": [ { "type": "aws:cdk:logicalId", "data": "DefaultCrNodeVersionMap" } ], - "/aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [ + "/aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [ { "type": "aws:cdk:logicalId", "data": "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" } ], - "/aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [ + "/aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [ { "type": "aws:cdk:logicalId", "data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F" } ], - "/aws-cdk-s3-access-logs-sse-kms/Bucket/Resource": [ + "/aws-cdk-s3-server-access-logs-sse-kms/Bucket/Resource": [ { "type": "aws:cdk:logicalId", "data": "Bucket83908E77" } ], - "/aws-cdk-s3-access-logs-sse-kms/BootstrapVersion": [ + "/aws-cdk-s3-server-access-logs-sse-kms/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/aws-cdk-s3-access-logs-sse-kms/CheckBootstrapVersion": [ + "/aws-cdk-s3-server-access-logs-sse-kms/CheckBootstrapVersion": [ { "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" + "displayName": "aws-cdk-s3-server-access-logs-sse-kms" }, "ServerAccessLogsSseKmsTestDefaultTestDeployAssertB937C102.assets": { "type": "cdk:asset-manifest", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/tree.json index b62eba1e079e6..d0a0498e601ec 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/tree.json @@ -4,21 +4,21 @@ "id": "App", "path": "", "children": { - "aws-cdk-s3-access-logs-sse-kms": { - "id": "aws-cdk-s3-access-logs-sse-kms", - "path": "aws-cdk-s3-access-logs-sse-kms", + "aws-cdk-s3-server-access-logs-sse-kms": { + "id": "aws-cdk-s3-server-access-logs-sse-kms", + "path": "aws-cdk-s3-server-access-logs-sse-kms", "children": { "ServerAccessLogsBucket": { "id": "ServerAccessLogsBucket", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket", "children": { "Key": { "id": "Key", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::KMS::Key", "aws:cdk:cloudformation:props": { @@ -63,7 +63,7 @@ ], "Version": "2012-10-17" }, - "description": "Created by aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket" + "description": "Created by aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket" } }, "constructInfo": { @@ -79,7 +79,7 @@ }, "Resource": { "id": "Resource", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Resource", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::S3::Bucket", "aws:cdk:cloudformation:props": { @@ -113,11 +113,11 @@ }, "Policy": { "id": "Policy", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::S3::BucketPolicy", "aws:cdk:cloudformation:props": { @@ -218,11 +218,11 @@ }, "AutoDeleteObjectsCustomResource": { "id": "AutoDeleteObjectsCustomResource", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource", "children": { "Default": { "id": "Default", - "path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default", + "path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -242,7 +242,7 @@ }, "DefaultCrNodeVersionMap": { "id": "DefaultCrNodeVersionMap", - "path": "aws-cdk-s3-access-logs-sse-kms/DefaultCrNodeVersionMap", + "path": "aws-cdk-s3-server-access-logs-sse-kms/DefaultCrNodeVersionMap", "constructInfo": { "fqn": "aws-cdk-lib.CfnMapping", "version": "0.0.0" @@ -250,11 +250,11 @@ }, "Custom::S3AutoDeleteObjectsCustomResourceProvider": { "id": "Custom::S3AutoDeleteObjectsCustomResourceProvider", - "path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider", "children": { "Staging": { "id": "Staging", - "path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -262,7 +262,7 @@ }, "Role": { "id": "Role", - "path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -270,7 +270,7 @@ }, "Handler": { "id": "Handler", - "path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -284,11 +284,11 @@ }, "Bucket": { "id": "Bucket", - "path": "aws-cdk-s3-access-logs-sse-kms/Bucket", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Bucket", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-s3-access-logs-sse-kms/Bucket/Resource", + "path": "aws-cdk-s3-server-access-logs-sse-kms/Bucket/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::S3::Bucket", "aws:cdk:cloudformation:props": { @@ -313,7 +313,7 @@ }, "BootstrapVersion": { "id": "BootstrapVersion", - "path": "aws-cdk-s3-access-logs-sse-kms/BootstrapVersion", + "path": "aws-cdk-s3-server-access-logs-sse-kms/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -321,7 +321,7 @@ }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "aws-cdk-s3-access-logs-sse-kms/CheckBootstrapVersion", + "path": "aws-cdk-s3-server-access-logs-sse-kms/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0"