From 7d296f752ccf4b4974a5de22aaf124ba0baa7e12 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Wed, 5 Dec 2018 13:41:53 -0500
Subject: [PATCH] don't add numeric indexes to resources with a count of 0

---
 helper/resource/state_shim.go      |  7 +++--
 helper/resource/state_shim_test.go | 49 +++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/helper/resource/state_shim.go b/helper/resource/state_shim.go
index 9c698d16a4..ceb4c6ac33 100644
--- a/helper/resource/state_shim.go
+++ b/helper/resource/state_shim.go
@@ -97,14 +97,17 @@ func shimNewState(newState *states.State, schemas *terraform.Schemas) (*terrafor
 				idx := ""
 				switch key.(type) {
 				case addrs.IntKey:
-					idx = fmt.Sprintf(".%d", key)
+					// don't add numeric index values to resources with a count of 0
+					if len(res.Instances) > 1 {
+						idx = fmt.Sprintf(".%d", key)
+					}
 				case addrs.StringKey:
 					idx = "." + key.String()
 				}
 
 				mod.Resources[res.Addr.String()+idx] = resState
 
-				// ad any deposed instances
+				// add any deposed instances
 				for _, dep := range i.Deposed {
 					flatmap, err := shimmedAttributes(dep, resSchema.ImpliedType())
 					if err != nil {
diff --git a/helper/resource/state_shim_test.go b/helper/resource/state_shim_test.go
index 1cad55134b..0f01747579 100644
--- a/helper/resource/state_shim_test.go
+++ b/helper/resource/state_shim_test.go
@@ -31,7 +31,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsFlat: map[string]string{"id": "foo", "bazzle": "dazzle"},
-			//AttrsJSON:     []byte(`{"id": "foo", "bazzle":"dazzle"}`),
 			Dependencies: []addrs.Referenceable{
 				addrs.ResourceInstance{
 					Resource: addrs.Resource{
@@ -53,8 +52,7 @@ func TestStateShim(t *testing.T) {
 			Name: "baz",
 		}.Instance(addrs.NoKey),
 		&states.ResourceInstanceObjectSrc{
-			Status: states.ObjectReady,
-			//AttrsJSON:     []byte(`{"id": "baz", "bazzle":"dazzle"}`),
+			Status:       states.ObjectReady,
 			AttrsFlat:    map[string]string{"id": "baz", "bazzle": "dazzle"},
 			Dependencies: []addrs.Referenceable{},
 		},
@@ -72,8 +70,7 @@ func TestStateShim(t *testing.T) {
 			Name: "foo",
 		}.Instance(addrs.NoKey),
 		&states.ResourceInstanceObjectSrc{
-			Status: states.ObjectReady,
-			//AttrsFlat: map[string]string{"id": "bar", "fuzzle": "wuzzle"},
+			Status:       states.ObjectReady,
 			AttrsJSON:    []byte(`{"id": "bar", "fuzzle":"wuzzle"}`),
 			Dependencies: []addrs.Referenceable{},
 		},
@@ -88,8 +85,7 @@ func TestStateShim(t *testing.T) {
 			Name: "baz",
 		}.Instance(addrs.NoKey),
 		&states.ResourceInstanceObjectSrc{
-			Status: states.ObjectReady,
-			//AttrsFlat: map[string]string{"id": "bar", "fizzle": "wizzle"},
+			Status:    states.ObjectReady,
 			AttrsJSON: []byte(`{"id": "bar", "fizzle":"wizzle"}`),
 			Dependencies: []addrs.Referenceable{
 				addrs.ResourceInstance{
@@ -116,7 +112,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsFlat: map[string]string{"id": "old", "fizzle": "wizzle"},
-			//AttrsJSON: []byte(`{"id": "old", "fizzle":"wizzle"}`),
 			Dependencies: []addrs.Referenceable{
 				addrs.ResourceInstance{
 					Resource: addrs.Resource{
@@ -139,9 +134,8 @@ func TestStateShim(t *testing.T) {
 			Name: "lots",
 		}.Instance(addrs.IntKey(0)),
 		&states.ResourceInstanceObjectSrc{
-			Status:    states.ObjectReady,
-			AttrsFlat: map[string]string{"id": "0", "bazzle": "dazzle"},
-			//AttrsJSON:     []byte(`{"id": "0", "bazzle":"dazzle"}`),
+			Status:       states.ObjectReady,
+			AttrsFlat:    map[string]string{"id": "0", "bazzle": "dazzle"},
 			Dependencies: []addrs.Referenceable{},
 		},
 		addrs.ProviderConfig{
@@ -155,9 +149,24 @@ func TestStateShim(t *testing.T) {
 			Name: "lots",
 		}.Instance(addrs.IntKey(1)),
 		&states.ResourceInstanceObjectSrc{
-			Status:    states.ObjectTainted,
-			AttrsFlat: map[string]string{"id": "1", "bazzle": "dazzle"},
-			//AttrsJSON:     []byte(`{"id": "1", "bazzle":"dazzle"}`),
+			Status:       states.ObjectTainted,
+			AttrsFlat:    map[string]string{"id": "1", "bazzle": "dazzle"},
+			Dependencies: []addrs.Referenceable{},
+		},
+		addrs.ProviderConfig{
+			Type: "test",
+		}.Absolute(childInstance),
+	)
+
+	childModule.SetResourceInstanceCurrent(
+		addrs.Resource{
+			Mode: addrs.ManagedResourceMode,
+			Type: "test_thing",
+			Name: "single_count",
+		}.Instance(addrs.IntKey(0)),
+		&states.ResourceInstanceObjectSrc{
+			Status:       states.ObjectReady,
+			AttrsJSON:    []byte(`{"id": "single", "bazzle":"dazzle"}`),
 			Dependencies: []addrs.Referenceable{},
 		},
 		addrs.ProviderConfig{
@@ -259,6 +268,16 @@ func TestStateShim(t *testing.T) {
 							Tainted: true,
 						},
 					},
+					"test_thing.single_count": &terraform.ResourceState{
+						Type: "test_thing",
+						Primary: &terraform.InstanceState{
+							ID: "single",
+							Attributes: map[string]string{
+								"id":     "single",
+								"bazzle": "dazzle",
+							},
+						},
+					},
 				},
 			},
 		},
@@ -309,6 +328,6 @@ func TestStateShim(t *testing.T) {
 	}
 
 	if !expected.Equal(shimmed) {
-		t.Fatalf("\nexpected state:\n%s\ngot state:\n%s", expected, shimmed)
+		t.Fatalf("\nexpected state:\n%s\n\ngot state:\n%s", expected, shimmed)
 	}
 }