WIP computed map perpetual diff debugging

refs #1607
hashicorp · Apr 20, 2015 · efb3b73 · efb3b73
1 parent 4d82d0a
commit efb3b73
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/helper/schema/field_reader_map.go b/helper/schema/field_reader_map.go
@@ -56,10 +56,10 @@ func (r *MapFieldReader) readMap(k string) (FieldReadResult, error) {
 	prefix := k + "."
 	r.Map.Range(func(k, v string) bool {
 		if strings.HasPrefix(k, prefix) {
+			resultSet = true
 			key := k[len(prefix):]
 			if key != "#" {
 				result[key] = v
-				resultSet = true
 			}
 		}
 

diff --git a/helper/schema/field_writer_map.go b/helper/schema/field_writer_map.go
@@ -157,6 +157,7 @@ func (w *MapFieldWriter) setMap(
 	if len(vs) == 0 {
 		// The empty string here means the map is removed.
 		w.result[k] = ""
+		w.result[k+".#"] = "0"
 		return nil
 	}
 

diff --git a/helper/schema/field_writer_map_test.go b/helper/schema/field_writer_map_test.go
@@ -159,10 +159,11 @@ func TestMapFieldWriter(t *testing.T) {
 
 		"map delete": {
 			[]string{"map"},
-			nil,
+			map[string]interface{}{},
 			false,
 			map[string]string{
-				"map": "",
+				"map.#": "0",
+				"map":   "",
 			},
 		},
 

diff --git a/helper/schema/resource_data_test.go b/helper/schema/resource_data_test.go
@@ -2512,7 +2512,9 @@ func TestResourceDataState(t *testing.T) {
 			},
 
 			Result: &terraform.InstanceState{
-				Attributes: map[string]string{},
+				Attributes: map[string]string{
+					"tags.#": "0",
+				},
 			},
 		},
 

diff --git a/helper/schema/schema.go b/helper/schema/schema.go
@@ -13,6 +13,7 @@ package schema
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"reflect"
 	"sort"
@@ -634,6 +635,9 @@ func (m schemaMap) diffMap(
 		return fmt.Errorf("%s: %s", k, err)
 	}
 
+	log.Printf("configMap: %#v", configMap)
+	log.Printf("stateMap: %#v", stateMap)
+
 	// Delete any count values, since we don't use those
 	delete(configMap, "#")
 	delete(stateMap, "#")

diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go
@@ -2201,6 +2201,28 @@ func TestSchemaMap_Diff(t *testing.T) {
 
 			Err: false,
 		},
+
+		// #57 - Computed map known to be empty doesn't generate diff
+		{
+			Schema: map[string]*Schema{
+				"tags": &Schema{
+					Type:     TypeMap,
+					Computed: true,
+				},
+			},
+
+			Config: nil,
+
+			State: &terraform.InstanceState{
+				Attributes: map[string]string{
+					"tags.#": "0",
+				},
+			},
+
+			Diff: nil,
+
+			Err: false,
+		},
 	}
 
 	for i, tc := range cases {