diff --git a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.assets.json index c2041a6d00af9..329238c1350be 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.assets.json @@ -1,7 +1,7 @@ { "version": "38.0.1", "files": { - "ff06a4c258e6b54d1b288229140ba9546fd8b36f0802a6743b8ccd43fb8927c3": { + "f317d1d8eb0f6b3d1c8990bc82107ef6959bc53324190e036a7734ea3b5189a8": { "source": { "path": "TestStack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ff06a4c258e6b54d1b288229140ba9546fd8b36f0802a6743b8ccd43fb8927c3.json", + "objectKey": "f317d1d8eb0f6b3d1c8990bc82107ef6959bc53324190e036a7734ea3b5189a8.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/core/test/integ.removal-policies.js.snapshot/TestStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.template.json index 4c89e43cb7b5a..7e3859e62e83b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/TestStack.template.json @@ -32,6 +32,11 @@ "Type": "AWS::IAM::User", "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" + }, + "DestroyBucket924C7F03": { + "Type": "AWS::S3::Bucket", + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" } }, "Parameters": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/manifest.json index 2a84f9725cd6f..79f3737f773e8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/manifest.json @@ -18,7 +18,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}/ff06a4c258e6b54d1b288229140ba9546fd8b36f0802a6743b8ccd43fb8927c3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f317d1d8eb0f6b3d1c8990bc82107ef6959bc53324190e036a7734ea3b5189a8.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -52,6 +52,12 @@ "data": "TestUser6A619381" } ], + "/TestStack/DestroyBucket/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DestroyBucket924C7F03" + } + ], "/TestStack/BootstrapVersion": [ { "type": "aws:cdk:logicalId", diff --git a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/tree.json index 2474990be0e3e..d46895344354b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.js.snapshot/tree.json @@ -99,6 +99,28 @@ "version": "0.0.0" } }, + "DestroyBucket": { + "id": "DestroyBucket", + "path": "TestStack/DestroyBucket", + "children": { + "Resource": { + "id": "Resource", + "path": "TestStack/DestroyBucket/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::S3::Bucket", + "aws:cdk:cloudformation:props": {} + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.CfnBucket", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.Bucket", + "version": "0.0.0" + } + }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "TestStack/BootstrapVersion", diff --git a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.ts b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.ts index 3d00f64cdacaa..cd167ccf1971b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/core/test/integ.removal-policies.ts @@ -7,15 +7,19 @@ import * as integ from '@aws-cdk/integ-tests-alpha'; const app = new App(); const stack = new Stack(app, 'TestStack'); -// Create resources new s3.Bucket(stack, 'TestBucket'); + new dynamodb.Table(stack, 'TestTable', { partitionKey: { name: 'id', type: dynamodb.AttributeType.STRING }, }); + const user = new iam.User(stack, 'TestUser'); user.applyRemovalPolicy(RemovalPolicy.RETAIN); -// Apply different removal policies to demonstrate functionality +new s3.Bucket(stack, 'DestroyBucket', { + removalPolicy: RemovalPolicy.DESTROY, +}); + RemovalPolicies.of(stack).destroy(); new integ.IntegTest(app, 'RemovalPoliciesTest', {