Merge pull request #3257 from fatih/fix-nil-setting-schema

schema: delete non existing values
hashicorp · Dec 9, 2015 · edaf579 · edaf579
2 parents 3041920 + f269d4f
commit edaf579
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/helper/schema/field_writer_map.go b/helper/schema/field_writer_map.go
@@ -207,7 +207,8 @@ func (w *MapFieldWriter) setPrimitive(
  k := strings.Join(addr, ".")
 
  if v == nil {
- delete(w.result, k)
+ // The empty string here means the value is removed.
+ w.result[k] = ""
  return nil
  }
 

diff --git a/helper/schema/field_writer_map_test.go b/helper/schema/field_writer_map_test.go
@@ -97,6 +97,15 @@ func TestMapFieldWriter(t *testing.T) {
  },
  },
 
+ "string nil": {
+ []string{"string"},
+ nil,
+ false,
+ map[string]string{
+ "string": "",
+ },
+ },
+
  "list of resources": {
  []string{"listResource"},
  []interface{}{