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

feat(bootstrap): add kms option to cdk bootstrap #3634

Merged
merged 8 commits into from
Aug 13, 2019
Merged

feat(bootstrap): add kms option to cdk bootstrap #3634

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ac9f10
feat(bootstrap): add kms option to cdk bootstrap
hoegertn Aug 13, 2019
cffa67e
feat(bootstrap): PR review
hoegertn Aug 13, 2019
728d5e6
feat(bootstrap): more aliases
hoegertn Aug 13, 2019
6d237d9
fix(bootstrap): swap aliases
hoegertn Aug 13, 2019
55b077a
Merge branch 'master' into add-kms-key-id-option
hoegertn Aug 13, 2019
2a7a858
Merge branch 'master' into add-kms-key-id-option
Aug 13, 2019
7d4a16f
Merge branch 'master' into add-kms-key-id-option
mergify[bot] Aug 13, 2019
066927b
Merge branch 'master' into add-kms-key-id-option
mergify[bot] Aug 13, 2019
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/bin/cdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async function parseCommandLineArguments() {
.command([ 'synthesize [STACKS..]', 'synth [STACKS..]' ], 'Synthesizes and prints the CloudFormation template for this stack', yargs => yargs
.option('exclusively', { type: 'boolean', alias: 'e', desc: 'only deploy requested stacks, don\'t include dependencies' }))
.command('bootstrap [ENVIRONMENTS..]', 'Deploys the CDK toolkit stack into an AWS environment', yargs => yargs
.option('toolkit-bucket-name', { type: 'string', alias: 'b', desc: 'The name of the CDK toolkit bucket', default: undefined })
.option('toolkit-bucket-name', { type: 'string', alias: ['b', 'bootstrap-bucket-name'], desc: 'The name of the CDK toolkit bucket', default: undefined })
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry for being annoying, can you make bootstrap-bucket-name the primary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, give me a second. I am fixing the multiple LambdaIntegrations PR currently

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

.option('bootstrap-kms-key-id', { type: 'string', desc: 'AWS KMS master key ID used for the SSE-KMS encryption', default: undefined }))
.command('deploy [STACKS..]', 'Deploys the stack(s) named STACKS into your AWS account', yargs => yargs
.option('build-exclude', { type: 'array', alias: 'E', nargs: 1, desc: 'do not rebuild asset with the given ID. Can be specified multiple times.', default: [] })
Expand Down