-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(core): add setter for termination protection on stack #26992
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e1d72fd
feat(core): add setter for termination protection on stack
msambol 92a249d
Add readme update
msambol 7b62885
Merge branch 'main' into setter-term-protection
mrgrain 88e588e
Merge branch 'main' into setter-term-protection
mergify[bot] 950140f
Merge branch 'main' into setter-term-protection
mergify[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
...@aws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/Stack.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "34.0.0", | ||
| "files": { | ||
| "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { | ||
| "source": { | ||
| "path": "Stack.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
36 changes: 36 additions & 0 deletions
36
...ws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/Stack.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
packages/@aws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/cdk.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"version":"34.0.0"} |
12 changes: 12 additions & 0 deletions
12
packages/@aws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/integ.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "version": "34.0.0", | ||
| "testCases": { | ||
| "stack/DefaultTest": { | ||
| "stacks": [ | ||
| "Stack" | ||
| ], | ||
| "assertionStack": "stack/DefaultTest/DeployAssert", | ||
| "assertionStackName": "stackDefaultTestDeployAssert0386B0AD" | ||
| } | ||
| } | ||
| } |
107 changes: 107 additions & 0 deletions
107
...ges/@aws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| { | ||
| "version": "34.0.0", | ||
| "artifacts": { | ||
| "Stack.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "Stack.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "Stack": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "Stack.template.json", | ||
| "terminationProtection": true, | ||
| "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "Stack.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "Stack.assets" | ||
| ], | ||
| "metadata": { | ||
| "/Stack/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/Stack/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "Stack" | ||
| }, | ||
| "stackDefaultTestDeployAssert0386B0AD.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "stackDefaultTestDeployAssert0386B0AD.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "stackDefaultTestDeployAssert0386B0AD": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "stackDefaultTestDeployAssert0386B0AD.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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "stackDefaultTestDeployAssert0386B0AD.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "stackDefaultTestDeployAssert0386B0AD.assets" | ||
| ], | ||
| "metadata": { | ||
| "/stack/DefaultTest/DeployAssert/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/stack/DefaultTest/DeployAssert/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "stack/DefaultTest/DeployAssert" | ||
| }, | ||
| "Tree": { | ||
| "type": "cdk:tree", | ||
| "properties": { | ||
| "file": "tree.json" | ||
| } | ||
| } | ||
| } | ||
| } | ||
19 changes: 19 additions & 0 deletions
19
...g/test/core/test/integ.stack.js.snapshot/stackDefaultTestDeployAssert0386B0AD.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "34.0.0", | ||
| "files": { | ||
| "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { | ||
| "source": { | ||
| "path": "stackDefaultTestDeployAssert0386B0AD.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
36 changes: 36 additions & 0 deletions
36
...test/core/test/integ.stack.js.snapshot/stackDefaultTestDeployAssert0386B0AD.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
101 changes: 101 additions & 0 deletions
101
packages/@aws-cdk-testing/framework-integ/test/core/test/integ.stack.js.snapshot/tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| { | ||
| "version": "tree-0.1", | ||
| "tree": { | ||
| "id": "App", | ||
| "path": "", | ||
| "children": { | ||
| "Stack": { | ||
| "id": "Stack", | ||
| "path": "Stack", | ||
| "children": { | ||
| "BootstrapVersion": { | ||
| "id": "BootstrapVersion", | ||
| "path": "Stack/BootstrapVersion", | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.CfnParameter", | ||
| "version": "0.0.0" | ||
| } | ||
| }, | ||
| "CheckBootstrapVersion": { | ||
| "id": "CheckBootstrapVersion", | ||
| "path": "Stack/CheckBootstrapVersion", | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.CfnRule", | ||
| "version": "0.0.0" | ||
| } | ||
| } | ||
| }, | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.Stack", | ||
| "version": "0.0.0" | ||
| } | ||
| }, | ||
| "stack": { | ||
| "id": "stack", | ||
| "path": "stack", | ||
| "children": { | ||
| "DefaultTest": { | ||
| "id": "DefaultTest", | ||
| "path": "stack/DefaultTest", | ||
| "children": { | ||
| "Default": { | ||
| "id": "Default", | ||
| "path": "stack/DefaultTest/Default", | ||
| "constructInfo": { | ||
| "fqn": "constructs.Construct", | ||
| "version": "10.2.70" | ||
| } | ||
| }, | ||
| "DeployAssert": { | ||
| "id": "DeployAssert", | ||
| "path": "stack/DefaultTest/DeployAssert", | ||
| "children": { | ||
| "BootstrapVersion": { | ||
| "id": "BootstrapVersion", | ||
| "path": "stack/DefaultTest/DeployAssert/BootstrapVersion", | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.CfnParameter", | ||
| "version": "0.0.0" | ||
| } | ||
| }, | ||
| "CheckBootstrapVersion": { | ||
| "id": "CheckBootstrapVersion", | ||
| "path": "stack/DefaultTest/DeployAssert/CheckBootstrapVersion", | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.CfnRule", | ||
| "version": "0.0.0" | ||
| } | ||
| } | ||
| }, | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.Stack", | ||
| "version": "0.0.0" | ||
| } | ||
| } | ||
| }, | ||
| "constructInfo": { | ||
| "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", | ||
| "version": "0.0.0" | ||
| } | ||
| } | ||
| }, | ||
| "constructInfo": { | ||
| "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", | ||
| "version": "0.0.0" | ||
| } | ||
| }, | ||
| "Tree": { | ||
| "id": "Tree", | ||
| "path": "Tree", | ||
| "constructInfo": { | ||
| "fqn": "constructs.Construct", | ||
| "version": "10.2.70" | ||
| } | ||
| } | ||
| }, | ||
| "constructInfo": { | ||
| "fqn": "aws-cdk-lib.App", | ||
| "version": "0.0.0" | ||
| } | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
packages/@aws-cdk-testing/framework-integ/test/core/test/integ.stack.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import * as cdk from 'aws-cdk-lib'; | ||
| import { IntegTest } from '@aws-cdk/integ-tests-alpha'; | ||
|
|
||
| /** | ||
| * This test creates a stack and changes termination protection with the setter. | ||
| */ | ||
|
|
||
| const app = new cdk.App(); | ||
| const stack = new cdk.Stack(app, 'Stack', { terminationProtection: false }); | ||
| stack.terminationProtection = true; | ||
|
|
||
| new IntegTest(app, 'stack', { testCases: [stack] }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is true. the stack was initialized with false but then set to true with setter.