Rework config storage #986
Merged
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
ellismg
added
impact/breaking
justinvp
approved these changes
Feb 28, 2018
cmd/config.go
Outdated
| } | ||
| raw, err := v.Value(d) | ||
| if err != nil { | ||
| return errors.Wrap(err, "could not decrypt configuation value") |
There was a problem hiding this comment.
Nit: configuation => configuration
cmd/upgrade_config.go
Outdated
|
|
||
| // upgradeConfigutationFiles does an upgrade to move from the old configuration system (where we had config stored) in | ||
| // workspace settings and Pulumi.yaml, to the new system where configuration data is stored in Pulumi.<stack-name>.yaml | ||
| func upgradeConfigutationFiles() error { |
There was a problem hiding this comment.
upgradeConfigutationFiles => upgradeConfigurationFiles (and in the comment above)
cmd/upgrade_config.go
Outdated
| func upgradeConfigutationFiles() error { | ||
| bes, _ := allBackends() | ||
|
|
||
| skipedUpgrade := false |
There was a problem hiding this comment.
Nit: skipedUpgrade => skippedUpgrade
pkg/backend/local/crypto.go
Outdated
| } | ||
|
|
||
| // Read a passphrase and confirm it. | ||
| // Here, the stack does not have an EcryptionSalt, so we will get a passphrase and create one |
There was a problem hiding this comment.
Nit: EcryptionSalt => EncryptionSalt
pkg/workspace/project.go
Outdated
| return len(ps.Config) == 0 && ps.EncryptionSalt == "" | ||
| } | ||
|
|
||
| // Save writes a project defitiniton to a file. |
There was a problem hiding this comment.
Nit: defitiniton => definition
Yes. |
We are going to be changing the configuration model. To begin, let's take most of the existing stuff and mark it as "deprecated" so we can keep the existing behavior (to help transition newer code forward) while making it clear what APIs should not be called in the implementation of `pulumi` itself.
We had other ways to get at this data, so let's just unify on them.
This change updates our configuration model to make it simpler to understand by removing some features and changing how things are persisted in files. Notable changes: - We've removed the notion of "workspace" vs "project" config. Now, configuration is always stored in a file next to `Pulumi.yaml` named `Pulumi.<stack-name>.yaml` (the same file we'd use for an other stack specific information we would need to persist in the future). - We've removed the notion of project wide configuration. Every new stack gets a completely empty set of configuration and there's no way to share common values across stacks, instead the common value has to be set on each stack. We retain some of the old code for the configuration system so we can support upgrading a project in place. That will happen with the next change. This change fixes some issues and allows us to close some others (since they are no longer possible). Fixes #866 Closes #872 Closes #731
Migrate configuration from the old model to the new model. The strategy here is that when we first run `pulumi` we enumerate all of the stacks from all of the backends we know about and for each stack get the configuration values from the project and workspace and promote them into the new file. As we do this, we remove stack specific config from the workspace and Pulumi.yaml file. If we are able to upgrade all the stacks we know about, we delete all global configuration data in the workspace and in Pulumi.yaml as well. We have a test that ensures upgrades continue to work.
|
(Close and re-open to see if that makes the AppVeyor job actually run) |
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.
This change reworks the way configuration is stored, adopting the model we discussed previously. In this new model, there is no longer a concept of project settings vs workspace settings and configuration for a stack is now stored in a file next to
Pulumi.yaml, namedPulumi.<stack-name>.yamlI've added code so that on first run,
pulumiwill try to migrate projects from the old plan to the new plan, which should minimize the pain, but switches like--alland--saveare no longer supported.It may be more approachable to review commit by commit.
For the changelog:
This change updates our configuration model to make it simpler to
understand by removing some features and changing how things are
persisted in files.
Notable changes:
config. Now, configuration is always stored in a file next to
Pulumi.yamlnamedPulumi.<stack-name>.yaml(the same file we'duse for an other stack specific information we would need to persist
in the future).
stack gets a completely empty set of configuration and there's no
way to share common values across stacks, instead the common value
has to be set on each stack.
Fixes #866
Closes #872
Closes #731