config: Merge respects Terraform blocks, provider aliases, and more #10720
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
Fixes #10715 `config.Merge` was not updated to support a number of new features. This updates the codepath to merge various fields, including the `terraform` block which was the issue in #10715. The `Merge` API is called when an `_override` file is present to _merge_ configurations. Normally configurations are _appended_. Only an override file triggers a _merge_. I started working on a generic library to do this automatically awhile back but never finished it. This might motivate me to do so. In the interest of getting a fix out though, we'll continue the manual approach.
jbardin
approved these changes
Dec 14, 2016
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #10715
config.Mergewas not updated to support a number of new features. Thisupdates the codepath to merge various fields, including the
terraformblock which was the issue in #10715.
This also updates
config.Appendto supportterraformblocks. This couldcause the
terraformblock to be removed with multiple files present. Oy!The
MergeAPI is called when an_overridefile is present to mergeconfigurations. Normally configurations are appended. Only an override
file triggers a merge.
I started working on a generic library to do this automatically awhile
back but never finished it. This might motivate me to do so. In the
interest of getting a fix out though, we'll continue the manual
approach.