diff --git a/helper/schema/field_writer_map.go b/helper/schema/field_writer_map.go index 3e9b047192e7..ea877e147eb1 100644 --- 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 index 8cf8100f2cd4..c9373da5dd18 100644 --- 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{}{