fix: diff leaves empty stack in REVIEW_IN_PROGRESS#1534
Merged
aws-cdk-automation merged 1 commit intoMay 20, 2026
Merged
Conversation
When `cdk diff --method=change-set` is run against a stack that doesn't exist, a CREATE changeset is made which puts the stack into REVIEW_IN_PROGRESS state. After describing the changeset, only the changeset was deleted but the empty stack was left behind. This change deletes the stack after cleaning up the changeset when the stack didn't previously exist. Also treats DELETE_IN_PROGRESS as non-existent to handle the race condition of running diff twice in quick succession. Closes #1503
Contributor
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1534 +/- ##
==========================================
- Coverage 88.22% 88.20% -0.02%
==========================================
Files 76 76
Lines 10820 10820
Branches 1488 1489 +1
==========================================
- Hits 9546 9544 -2
- Misses 1246 1248 +2
Partials 28 28
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
mrgrain
changed the title
rix0rrr
approved these changes
May 20, 2026
aws-cdk-automation
deleted the
mrgrain/fix/toolkit-lib/diff-cleanup-review-in-progress
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #1503
When
cdk diff --method=change-setis run against a stack that doesn't exist in the target account, a CREATE changeset is created which puts the stack intoREVIEW_IN_PROGRESSstate. Previously, only the changeset was deleted after the diff completed, leaving behind an empty phantom stack that the user would have to manually delete.This change deletes the stack after cleaning up the changeset when the stack didn't previously exist. It also treats
DELETE_IN_PROGRESSas non-existent to handle the race condition where diff is run twice in quick succession — the second invocation would otherwise try to create an UPDATE changeset against the deleting stack.Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license