fix(toolkit): fix context passed in from command-line #1939
Conversation
This file contains 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
Fix issue where context passed in via command-line was ignored. Migration behavior has been changed: context that looks like it has been generated by context providers (keys containing ":") will upon loading be migrated to `cdk.context.json`; other context in `cdk.json` will be left as-is and treated as readonly. Fixes #1911.
eladb
approved these changes
Mar 4, 2019
| @@ -18,10 +18,11 @@ const CONTEXT_KEY = 'context'; | |||
| */ | |||
| export class Configuration { | |||
| public settings = new Settings(); | |||
| public context = new Context(new Settings(), [], new Settings()); | |||
| public context = new Context(new Settings()); | |||
|
|
|||
| @@ -18,10 +18,11 @@ const CONTEXT_KEY = 'context'; | |||
| */ | |||
| export class Configuration { | |||
| public settings = new Settings(); | |||
| public context = new Context(new Settings(), [], new Settings()); | |||
| public context = new Context(new Settings()); | |||
|
|
|||
| @@ -18,10 +18,11 @@ const CONTEXT_KEY = 'context'; | |||
| */ | |||
| export class Configuration { | |||
| public settings = new Settings(); | |||
| public context = new Context(new Settings(), [], new Settings()); | |||
| public context = new Context(new Settings()); | |||
|
|
|||
| this.context = new Context( | ||
| this.commandLineContext, | ||
| this.projectConfig.subSettings([CONTEXT_KEY]).makeReadOnly(), | ||
| this.projectContext); |
There was a problem hiding this comment.
This is a bit tricky, can we special-case it a bit more? Feel wrong to migrate all context that has : in it, or we should block this from user-defined context keys.
There was a problem hiding this comment.
I'll agree it's not fantastic, but I'd prefer just to take out the migration behavior a couple of releases in the future (maybe for GA) rather than complicate things now.
|
|
||
| constructor(private readonly bottom: Settings, private readonly bottomPrefixPath: string[], private readonly top: Settings) { | ||
| constructor(bag: Settings, ...bags: Settings[]) { | ||
| this.bags = [bag, ...bags]; | ||
| } |
eladb
approved these changes
Mar 4, 2019
|
I guess we need an integ test... |
sam-goodwin
pushed a commit
that referenced
this pull request
Mar 4, 2019
Fix issue where context passed in via command-line was ignored. Migration behavior has been changed: context that looks like it has been generated by context providers (keys containing ":") will upon loading be migrated to `cdk.context.json`; other context in `cdk.json` will be left as-is and treated as readonly. Fixes #1911.
sam-goodwin
pushed a commit
that referenced
this pull request
Mar 4, 2019
Fix issue where context passed in via command-line was ignored. Migration behavior has been changed: context that looks like it has been generated by context providers (keys containing ":") will upon loading be migrated to `cdk.context.json`; other context in `cdk.json` will be left as-is and treated as readonly. Fixes #1911.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix issue where context passed in via command-line was ignored.
Migration behavior has been changed: context that looks like it
has been generated by context providers (keys containing ":")
will upon loading be migrated to
cdk.context.json; othercontext in
cdk.jsonwill be left as-is and treated as readonly.Fixes #1911.
Pull Request Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license.