resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: RawConfig merge should only set unknown keys non-nil if 

non-empty
This commit is contained in:
Mitchell Hashimoto 2016-10-19 15:21:09 -07:00
parent a89dcfd1b1
commit fee0351c66
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/raw_config.go
View File

@ -191,6 +191,7 @@ func (r *RawConfig) Merge(other *RawConfig) *RawConfig {
} }
// Build the unknown keys // Build the unknown keys
if len(r.unknownKeys) > 0 || len(other.unknownKeys) > 0 {
unknownKeys := make(map[string]struct{}) unknownKeys := make(map[string]struct{})
for _, k := range r.unknownKeys { for _, k := range r.unknownKeys {
unknownKeys[k] = struct{}{} unknownKeys[k] = struct{}{}
@ -203,6 +204,7 @@ func (r *RawConfig) Merge(other *RawConfig) *RawConfig {
for k, _ := range unknownKeys { for k, _ := range unknownKeys {
result.unknownKeys = append(result.unknownKeys, k) result.unknownKeys = append(result.unknownKeys, k)
} }
}
return result return result
} }