terraform: non-multi count resource is still index 0

terraform/context_test.go

@@ -590,12 +590,11 @@ func TestContext2Plan_countIndex(t *testing.T) {
 	}
 }
 
-/*
-func TestContextPlan_countIndexZero(t *testing.T) {
+func TestContext2Plan_countIndexZero(t *testing.T) {
 	m := testModule(t, "plan-count-index-zero")
 	p := testProvider("aws")
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -614,6 +613,7 @@ func TestContextPlan_countIndexZero(t *testing.T) {
 	}
 }
 
+/*
 func TestContextPlan_countVar(t *testing.T) {
 	m := testModule(t, "plan-count-var")
 	p := testProvider("aws")

terraform/transform_resource.go

@@ -89,7 +89,13 @@ func (n *graphNodeExpandedResource) ProvidedBy() []string {
 
 // GraphNodeEvalable impl.
 func (n *graphNodeExpandedResource) EvalTree() EvalNode {
-	resource := &Resource{CountIndex: n.Index}
+	// Build the resource. If we aren't part of a multi-resource, then
+	// we still consider ourselves as count index zero.
+	index := n.Index
+	if index < 0 {
+		index = 0
+	}
+	resource := &Resource{CountIndex: index}
 
 	// Shared node for interpolation of configuration
 	interpolateNode := &EvalInterpolate{