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

Merge pull request #1315 from hashicorp/b-heroku-config-vars-2 

providers/heroku: empty config vars block shouldn't panic [GH-1211]
This commit is contained in:
Mitchell Hashimoto 2015-03-27 12:17:27 -07:00
parent ce29a87f85 e5a375ae58
commit 7d846cb97e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/heroku/resource_heroku_app.go
View File

@ -358,16 +358,20 @@ func updateConfigVars(
vars := make(map[string]*string) vars := make(map[string]*string)
for _, v := range o { for _, v := range o {
if v != nil {
for k, _ := range v.(map[string]interface{}) { for k, _ := range v.(map[string]interface{}) {
vars[k] = nil vars[k] = nil
} }
} }
}
for _, v := range n { for _, v := range n {
if v != nil {
for k, v := range v.(map[string]interface{}) { for k, v := range v.(map[string]interface{}) {
val := v.(string) val := v.(string)
vars[k] = &val vars[k] = &val
} }
} }
}
log.Printf("[INFO] Updating config vars: *%#v", vars) log.Printf("[INFO] Updating config vars: *%#v", vars)
if _, err := client.ConfigVarUpdate(id, vars); err != nil { if _, err := client.ConfigVarUpdate(id, vars); err != nil {