Skip to content
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.

Sign up for GitHub

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

fix(cli): termination protection not updated when change set has no changes #8275

Merged
merged 4 commits into from
Jun 3, 2020
Merged

fix(cli): termination protection not updated when change set has no changes #8275

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3eccb05
fix(core): termination protection not updated when change set has no …
jogold May 29, 2020
1c1c69d
correct boolean comparison
jogold May 29, 2020
6ce3c14
TERMINATION_PROTECTION
jogold Jun 2, 2020
364e4c7
Merge branch 'master' into termination-protection-no-changes
mergify[bot] Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions packages/aws-cdk/lib/api/deploy-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,17 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
debug('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id);
const changeSetDescription = await waitForChangeSet(cfn, deployName, changeSetName);

// Update termination protection only if it has changed.
const terminationProtection = stackArtifact.terminationProtection ?? false;
if (!!cloudFormationStack.terminationProtection !== terminationProtection) {
debug('Updating termination protection from %s to %s for stack %s', cloudFormationStack.terminationProtection, terminationProtection, deployName);
await cfn.updateTerminationProtection({
StackName: deployName,
EnableTerminationProtection: terminationProtection,
}).promise();
debug('Termination protection updated to %s for stack %s', terminationProtection, deployName);
}

if (changeSetHasNoChanges(changeSetDescription)) {
debug('No changes are to be performed on %s.', deployName);
await cfn.deleteChangeSet({ StackName: deployName, ChangeSetName: changeSetName }).promise();
Expand Down Expand Up @@ -262,17 +273,6 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
print('Changeset %s created and waiting in review for manual execution (--no-execute)', changeSetName);
}

// Update termination protection only if it has changed.
const terminationProtection = stackArtifact.terminationProtection ?? false;
if (cloudFormationStack.terminationProtection !== terminationProtection) {
debug('Updating termination protection from %s to %s for stack %s', cloudFormationStack.terminationProtection, terminationProtection, deployName);
await cfn.updateTerminationProtection({
StackName: deployName,
EnableTerminationProtection: terminationProtection,
}).promise();
debug('Termination protection updated to %s for stack %s', terminationProtection, deployName);
}

return { noOp: false, outputs: cloudFormationStack.outputs, stackArn: changeSet.StackId!, stackArtifact };
}

Expand Down Expand Up @@ -399,8 +399,7 @@ async function canSkipDeploy(deployStackOptions: DeployStackOptions, cloudFormat
}

// Termination protection has been updated
const terminationProtection = deployStackOptions.stack.terminationProtection ?? false; // cast to boolean for comparison
if (terminationProtection !== cloudFormationStack.terminationProtection) {
if (!!deployStackOptions.stack.terminationProtection !== !!cloudFormationStack.terminationProtection) {
debug(`${deployName}: termination protection has been updated`);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/integ/cli/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ new StackWithNestedStack(app, `${stackPrefix}-with-nested-stack`);
new StackWithNestedStackUsingParameters(app, `${stackPrefix}-with-nested-stack-using-parameters`);

new YourStack(app, `${stackPrefix}-termination-protection`, {
terminationProtection: true,
terminationProtection: process.env.TERMINATION_PROTECTION !== 'FALSE' ? true : false,
});

app.synth();
12 changes: 6 additions & 6 deletions packages/aws-cdk/test/integ/cli/cli.integtest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ test('Two ways of shoing the version', async () => {
});

test('Termination protection', async () => {
await cdkDeploy('termination-protection');
const stackName = 'termination-protection';
await cdkDeploy(stackName);

// Try a destroy that should fail
await expect(cdkDestroy('termination-protection')).rejects.toThrow('exited with error');
await expect(cdkDestroy(stackName)).rejects.toThrow('exited with error');

await cloudFormation('updateTerminationProtection', {
EnableTerminationProtection: false,
StackName: fullStackName('termination-protection'),
});
// Can update termination protection even though the change set doesn't contain changes
await cdkDeploy(stackName, { modEnv: { TERMINATION_PROTECTION: 'FALSE' } });
await cdkDestroy(stackName);
});

test('cdk synth', async () => {
Expand Down