12 Commits (551eedcf2616376b00d7da170b09f682bbfa3445)

Author	SHA1	Message	Date
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.	9 years ago
Mitchell Hashimoto	fdded8ca14	config: allow atlas block	11 years ago
Mitchell Hashimoto	dd6f536fab	config: Merge for modules works	12 years ago
Carlos Diaz-Padron	47529f829e	Fix maps race in append and merge tests	12 years ago
Mitchell Hashimoto	9d2e83d56d	config: Merge works properly	12 years ago
Mitchell Hashimoto	7bd7e4218f	config: make ProviderConfigs slice	12 years ago
Mitchell Hashimoto	3834846418	config: Outputs is now a slice	12 years ago
Mitchell Hashimoto	a19e2983de	terraform: tests passing for Config change	12 years ago
Mitchell Hashimoto	e4bcd3c448	config: Variables is now a slice	12 years ago
Mitchell Hashimoto	a583b800a4	config: add unknownKeys to Merge	12 years ago
Mitchell Hashimoto	3d67c967aa	config: make Merge an exported func	12 years ago