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

providers/heroku: empty config vars block shouldn't panic [GH-1211]
hashicorp · Mar 27, 2015 · 7d846cb · 7d846cb
2 parents ce29a87 + e5a375a
commit 7d846cb
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/builtin/providers/heroku/resource_heroku_app.go b/builtin/providers/heroku/resource_heroku_app.go
@@ -358,14 +358,18 @@ func updateConfigVars(
  vars := make(map[string]*string)
 
  for _, v := range o {
- for k, _ := range v.(map[string]interface{}) {
- vars[k] = nil
+ if v != nil {
+ for k, _ := range v.(map[string]interface{}) {
+ vars[k] = nil
+ }
  }
  }
  for _, v := range n {
- for k, v := range v.(map[string]interface{}) {
- val := v.(string)
- vars[k] = &val
+ if v != nil {
+ for k, v := range v.(map[string]interface{}) {
+ val := v.(string)
+ vars[k] = &val
+ }
  }
  }