feat(core): stack termination protection #7610

jogold · 2020-04-26T12:28:21Z

Commit Message

feat(core): stack termination protection (#7610)

Add a terminationProtection prop to StackProps to enable stack termination
protection.

This does not require extra IAM permission for existing CDK stacks
(cloudformation:UpdateTerminationProtection).

The logic to evaluate if we can skip deploy is now moved to a separate
function.

Closes #1682

End Commit Message

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

Add a `terminationProtection` prop to `StackProps` to enable stack termination protection. Closes aws#1682

aws-cdk-automation · 2020-04-26T13:13:26Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: 54ad340
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

eladb

Looks good. Just need to move the cx-api change to the cloud-assembly-schema

packages/@aws-cdk/cx-api/lib/cloud-artifact.ts

eladb

LGTM, @shivlaks please review and approve when ready

packages/@aws-cdk/cx-api/lib/cloud-artifact.ts

eladb · 2020-05-03T14:47:35Z

packages/aws-cdk/lib/api/deploy-stack.ts

@@ -149,13 +149,17 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
  const deployName = options.deployName || stackArtifact.stackName;


@shivlaks do you mind giving this a quick review?

eladb · 2020-05-03T14:48:07Z

packages/aws-cdk/lib/api/deploy-stack.ts

+    if (JSON.stringify(stackArtifact.template) === JSON.stringify(await cloudFormationStack.template())
+        && tagsIdentical
+        && cloudFormationStack.terminationProtection === terminationProtection) {
+      debug(`${deployName}: no change in template, tags or termination protection, skipping (use --force to override)`);


Feels like we should extract all the logic that decides whether a stack should be updated into a separate function now.

eladb · 2020-05-03T14:48:55Z

packages/aws-cdk/lib/api/deploy-stack.ts

+
+  // Update termination protection only if it has changed.
+  if (cloudFormationStack.terminationProtection !== terminationProtection) {
+    debug('Updating termination protection for stack %s', deployName);


add the previous and new values of terminationProtection in this log

Pull request has been modified.

aws-cdk-automation · 2020-05-04T11:54:53Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: 866e052
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

aws-cdk-automation · 2020-05-04T12:00:34Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: 4268af2
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

aws-cdk-automation · 2020-05-04T15:59:52Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: acbd210
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

shivlaks

Neat! this will be really handy for for users

It's also probably worth noting somewhere (maybe README) that Nested Stacks inherit this property from their parent stack and that it cannot be set on Nested Stacks.

packages/aws-cdk/lib/api/deploy-stack.ts

packages/aws-cdk/test/integ/cli/test-cdk-termination-protection.sh

jogold · 2020-05-04T19:28:51Z

It's also probably worth noting somewhere (maybe README) that Nested Stacks inherit this property from their parent stack and that it cannot be set on Nested Stacks.

I also thought about this and initially tried to find a way to prevent this from happening but AFAIU as NestedStackProps do not extend StackProps it will not be possible to set it on a Nested Stack when using the CDK.

shivlaks · 2020-05-04T20:09:09Z

I also thought about this and initially tried to find a way to prevent this from happening but AFAIU as NestedStackProps do not extend StackProps it will not be possible to set it on a Nested Stack when using the CDK.

I think it's reasonable since CloudFormation doesn't allow your to set termination directly on nested stacks anyways IIRC. Maybe just mention the behaviour in the README (that termination protection propagates to all nested stacks)

aws-cdk-automation · 2020-05-04T20:19:52Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: 24ae092
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

aws-cdk-automation · 2020-05-04T20:54:55Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
Commit ID: e3789a7
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

mergify · 2020-05-04T21:46:00Z

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

missed this in #7610

missed adding this in #7610

feat(core): stack termination protection

54ad340

Add a `terminationProtection` prop to `StackProps` to enable stack termination protection. Closes aws#1682

SomayaB requested review from shivlaks and removed request for shivlaks April 28, 2020 22:19

SomayaB assigned eladb Apr 28, 2020

eladb previously requested changes Apr 30, 2020

View reviewed changes

packages/@aws-cdk/cx-api/lib/cloud-artifact.ts Show resolved Hide resolved

eladb reviewed May 3, 2020

View reviewed changes

eladb assigned shivlaks and unassigned eladb May 3, 2020

Merge branch 'master' into termination-protection

82e2c88

jogold mentioned this pull request May 4, 2020

Add stack termination protection option to the cli #7766

Closed

jogold added 3 commits May 4, 2020 13:03

shouldSkipDeploy

ee0cbba

Merge branch 'master' into termination-protection

c16209c

canSkipDeploy

866e052

terminationProtection

4268af2

Merge branch 'master' into termination-protection

acbd210

shivlaks reviewed May 4, 2020

View reviewed changes

packages/aws-cdk/lib/api/deploy-stack.ts Show resolved Hide resolved

packages/aws-cdk/test/integ/cli/test-cdk-termination-protection.sh Show resolved Hide resolved

jogold added 2 commits May 4, 2020 21:33

cleanup()

136098f

Merge branch 'master' into termination-protection

24ae092

README nested stacks

e3789a7

shivlaks approved these changes May 4, 2020

View reviewed changes

mergify bot merged commit 7ed60b8 into aws:master May 4, 2020

shivlaks added a commit that referenced this pull request May 4, 2020

chore(cli): add stack termination stack to cdk ls test

2585911

missed this in #7610

shivlaks mentioned this pull request May 4, 2020

chore(cli): add termination-protection stack to cdk ls test #7786

Merged

mergify bot pushed a commit that referenced this pull request May 5, 2020

chore(cli): add termination-protection stack to cdk ls test (#7786)

4d4114a

missed adding this in #7610

jogold deleted the termination-protection branch May 31, 2020 07:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): stack termination protection #7610

feat(core): stack termination protection #7610

jogold commented Apr 26, 2020 •

edited

aws-cdk-automation commented Apr 26, 2020

eladb left a comment

eladb left a comment

eladb May 3, 2020

shivlaks May 4, 2020

eladb May 3, 2020

jogold May 4, 2020

eladb May 3, 2020

jogold May 4, 2020

aws-cdk-automation commented May 4, 2020

aws-cdk-automation commented May 4, 2020

aws-cdk-automation commented May 4, 2020

shivlaks left a comment •

edited

jogold commented May 4, 2020

shivlaks commented May 4, 2020

aws-cdk-automation commented May 4, 2020

aws-cdk-automation commented May 4, 2020

mergify bot commented May 4, 2020

		@@ -149,13 +149,17 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
		const deployName = options.deployName \|\| stackArtifact.stackName;

feat(core): stack termination protection #7610

feat(core): stack termination protection #7610

Conversation

jogold commented Apr 26, 2020 • edited

Commit Message

End Commit Message

aws-cdk-automation commented Apr 26, 2020

AWS CodeBuild CI Report

eladb left a comment

Choose a reason for hiding this comment

eladb left a comment

Choose a reason for hiding this comment

eladb May 3, 2020

Choose a reason for hiding this comment

shivlaks May 4, 2020

Choose a reason for hiding this comment

eladb May 3, 2020

Choose a reason for hiding this comment

jogold May 4, 2020

Choose a reason for hiding this comment

eladb May 3, 2020

Choose a reason for hiding this comment

jogold May 4, 2020

Choose a reason for hiding this comment

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

shivlaks left a comment • edited

Choose a reason for hiding this comment

jogold commented May 4, 2020

shivlaks commented May 4, 2020

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

mergify bot commented May 4, 2020

jogold commented Apr 26, 2020 •

edited

shivlaks left a comment •

edited