8 Commits (653a819cc3a2d2c7fb3f6a26b03f4e8a95e4d585)

Author	SHA1	Message	Date
Martin Atkins	8cd0ee80e5	config: merge/append for local values ... It seems that this somehow got lost in the commit/rebase shuffle and wasn't caught by the tests that _did_ make it because they were all using just one file. As a result of this bug, locals would fail to work correctly in any configuration with more than one .tf file. Along with restoring the append/merge behavior, this also reworks some of the tests to exercise the multi-file case as better insurance against regressions of this sort in future. This fixes #15969.	9 years ago
James Bardin	bcbcc65f7d	add terraform config merge logic to config.Merge	9 years ago
Mitchell Hashimoto	3878b8b093	config: Merge respects Terraform blocks, provider aliases, and more ... 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.	10 years ago
Panagiotis Moustafellos	e4845f75cc	removed extra parentheses	11 years ago
Mitchell Hashimoto	fdded8ca14	config: allow atlas block	11 years ago
Mitchell Hashimoto	dd6f536fab	config: Merge for modules works	12 years ago
Mitchell Hashimoto	b0ce89b805	config: change Default to an interface{}	12 years ago
Mitchell Hashimoto	9d2e83d56d	config: Merge works properly	12 years ago