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

Jump to bottom

Correctly account for CDK::Metadata resource in cdk diff` #435

Merged
merged 1 commit into from
Jul 30, 2018
Merged

Correctly account for CDK::Metadata resource in cdk diff` #435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions packages/aws-cdk/bin/cdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ async function initCommandLine() {
}

async function main(command: string, args: any): Promise<number | string | {} | void> {
const toolkitStackName = completeConfig().get(['toolkitStackName']) || DEFAULT_TOOLKIT_STACK_NAME;
const trackVersions = completeConfig().get(['versionReporting']);
const toolkitStackName: string = completeConfig().get(['toolkitStackName']) || DEFAULT_TOOLKIT_STACK_NAME;
const trackVersions: boolean = completeConfig().get(['versionReporting']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this mean in terms of disabling version reporting via cdk.json? I think this should be:

{
  "version-reporting": false
}

And not versionReporting (I am okay with allowing both)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kebab-case (version-reporting) in the JSON feels... weird. Also, if version-reporting, then toolkit-stack-name.

Allowing both feels... messy (then we want to check if we got both at the same time, and err if they disagree with each other... feels like an un-necessary evil).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, let's leave it versionReporting (although I like my reservation to be recorded for posterity).


args.STACKS = args.STACKS || [];
args.ENVIRONMENTS = args.ENVIRONMENTS || [];
Expand All @@ -180,7 +180,7 @@ async function initCommandLine() {
return await cliList({ long: args.long });

case 'diff':
return await diffStack(await findStack(args.STACK), args.template);
return await diffStack(await findStack(args.STACK), trackVersions, args.template);

case 'bootstrap':
return await cliBootstrap(args.ENVIRONMENTS, toolkitStackName);
Expand Down