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): diff reports wrong count of changed stacks #26796

Merged
merged 7 commits into from
Aug 21, 2023
Merged

fix(CLI): diff reports wrong count of changed stacks #26796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f7f09a
tmp
comcalvi Aug 17, 2023
3a04dfd
testing + correct nested stack counting
comcalvi Aug 18, 2023
63aa27f
whitespace
comcalvi Aug 18, 2023
2095ce7
Merge branch 'main' into stackdiffs
mergify[bot] Aug 21, 2023
1272a27
Merge branch 'main' into stackdiffs
comcalvi Aug 21, 2023
936e277
rename helper method
comcalvi Aug 21, 2023
f5566ba
Merge branch 'stackdiffs' of github.com:aws/aws-cdk into stackdiffs
comcalvi Aug 21, 2023
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
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/cdk-toolkit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export class CdkToolkit {
const currentTemplate = await this.props.deployments.readCurrentTemplateWithNestedStacks(stack, options.compareAgainstProcessedTemplate);
diffs += options.securityOnly
? numberFromBool(printSecurityDiff(currentTemplate, stack, RequireApproval.Broadening))
: printStackDiff(currentTemplate, stack, strict, contextLines, quiet, stream);
: printStackDiff(currentTemplate, stack, strict, contextLines, quiet, stream) > 0 ? 1 : 0;
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/aws-cdk/test/diff.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ describe('non-nested stacks', () => {
expect(exitCode).toBe(0);
});

test('diff reports correct number of stack diffs')

test('exits with 1 with diffs and fail set to true', async () => {
// GIVEN
const buffer = new StringWritable();
Expand Down
Loading