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

Merge branch 'warn_on_local_plugin_overrides' of https://github.com/Jonty/terraform into Jonty-warn_on_local_plugin_overrides

This commit is contained in:
James Nugent 2016-09-14 09:18:21 +01:00
parent 10226030dd e0c068f09d
commit 255fe7e74a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.go
View File

@ -169,12 +169,18 @@ func (c1 *Config) Merge(c2 *Config) *Config {
result.Providers[k] = v
}
for k, v := range c2.Providers {
if v1, ok := c1.Providers[k]; ok {
log.Printf("[WARN] Local %s provider configuration '%s' overrides '%s'", k, v, v1)
}
result.Providers[k] = v
}
for k, v := range c1.Provisioners {
result.Provisioners[k] = v
}
for k, v := range c2.Provisioners {
if v1, ok := c1.Provisioners[k]; ok {
log.Printf("[WARN] Local %s provisioner configuration '%s' overrides '%s'", k, v, v1)
}
result.Provisioners[k] = v
}