resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
terraform/config
History
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.
 		2016-12-13 21:48:59 -08:00
..
module config/module: tree.Child on a nil tree works 2016-10-19 13:38:49 -07:00
test-fixtures Merge pull request #10658 from hashicorp/b-var-keys 2016-12-12 10:53:07 -08:00
append.go config: allow atlas block 2015-03-24 13:30:22 -07:00
append_test.go removed extra parentheses 2015-10-08 15:48:04 +03:00
config.go config: Merge respects Terraform blocks, provider aliases, and more 2016-12-13 21:48:59 -08:00
config_string.go config: parse depends_on for outputs 2016-11-11 17:46:34 -08:00
config_test.go config: validate that data sources don't have provisioners 2016-11-23 08:46:13 -08:00
config_tree.go config: make Merge an exported func 2014-07-18 17:05:22 -07:00
import_tree.go Condense switch fallthroughs into expr lists 2015-05-26 21:52:36 -04:00
interpolate.go config: use ast.TypeUnknown and don't remove computed values 2016-11-09 14:28:15 -08:00
interpolate_funcs.go config: nitpicks from #10475 2016-12-01 18:02:39 -05:00
interpolate_funcs_test.go config: nitpicks from #10475 2016-12-01 18:02:39 -05:00
interpolate_test.go config: use ast.TypeUnknown and don't remove computed values 2016-11-09 14:28:15 -08:00
interpolate_walk.go config: maintain slice index accounting for computed keys 2016-11-14 18:33:29 -08:00
interpolate_walk_test.go config: use ast.TypeUnknown and don't remove computed values 2016-11-09 14:28:15 -08:00
lang.go remove config/lang, use hashicorp/hil 2016-02-03 13:24:04 -05:00
loader.go command/import: load configurations and allow empty config dirs 2016-11-09 15:08:22 -08:00
loader_hcl.go Merge pull request #10658 from hashicorp/b-var-keys 2016-12-12 10:53:07 -08:00
loader_hcl_test.go config: HCL loader 2014-08-11 09:58:53 -07:00
loader_test.go Merge pull request #10658 from hashicorp/b-var-keys 2016-12-12 10:53:07 -08:00
merge.go config: Merge respects Terraform blocks, provider aliases, and more 2016-12-13 21:48:59 -08:00
merge_test.go config: Merge respects Terraform blocks, provider aliases, and more 2016-12-13 21:48:59 -08:00
raw_config.go config: Merge respects Terraform blocks, provider aliases, and more 2016-12-13 21:48:59 -08:00
raw_config_test.go config: validate that RawConfig.Copy doesn't copy the interpolated 2016-12-02 13:25:32 -05:00
resource_mode.go config: "ResourceMode" concept for resources 2016-05-14 08:26:35 -07:00
resource_mode_string.go config: "ResourceMode" concept for resources 2016-05-14 08:26:35 -07:00
testing.go terraform: rename attach config to only attach provider config 2016-10-19 13:38:51 -07:00