rename

Author: dsa0x

internal/genconfig/generate_config.go

@@ -145,8 +145,8 @@ type UniqueAddr struct {
 	// Addr is the address of the resource instance.
 	Addr addrs.AbsResourceInstance
 
-	// ExpansionCounter is the enumeration of the address during expansion.
-	ExpansionCounter int
+	// ExpansionEnum is the enumeration of the address during expansion.
+	ExpansionEnum int
 }
 
 func GenerateListResourceContents(uniqAddr UniqueAddr,
@@ -178,7 +178,7 @@ func GenerateListResourceContents(uniqAddr UniqueAddr,
 		if addr.Resource.Key == addrs.NoKey {
 			resAddr.Resource.Resource.Name = fmt.Sprintf("%s_%d", addr.Resource.Resource.Name, idx)
 		} else {
-			resAddr.Resource.Resource.Name = fmt.Sprintf("%s_%d_%d", addr.Resource.Resource.Name, uniqAddr.ExpansionCounter, idx)
+			resAddr.Resource.Resource.Name = fmt.Sprintf("%s_%d_%d", addr.Resource.Resource.Name, uniqAddr.ExpansionEnum, idx)
 		}
 
 		content, gDiags := GenerateResourceContents(resAddr, schema, pc, res.Config, true)

internal/genconfig/generate_config_test.go

@@ -983,7 +983,7 @@ func TestGenerateResourceAndIDContents(t *testing.T) {
 	}
 
 	// Generate content
-	content, diags := GenerateListResourceContents(UniqueAddr{Addr: instAddr1, ExpansionCounter: 0}, schema, idSchema, pc, listElements)
+	content, diags := GenerateListResourceContents(UniqueAddr{Addr: instAddr1, ExpansionEnum: 0}, schema, idSchema, pc, listElements)
 	// Check for diagnostics
 	if diags.HasErrors() {
 		t.Fatalf("unexpected diagnostics: %s", diags.Err())

internal/terraform/node_resource_abstract_instance.go

@@ -53,11 +53,11 @@ type NodeAbstractResourceInstance struct {
 	// override is set by the graph itself, just before this node executes.
 	override *configs.Override
 
-	// expansionCounter tracks the index of the resource instance within the resource.
+	// expansionEnum tracks the index of the resource instance within the resource.
 	// While the index is an enumerated value, it does not represent the evaluation order
 	// of the instances. It is currently used to generate unique hcl identifiers, because
 	// for_each keys are not guaranteed to be valid identifiers.
-	expansionCounter int
+	expansionEnum int
 }
 
 // NewNodeAbstractResourceInstance creates an abstract resource instance graph

internal/terraform/node_resource_plan_instance.go

@@ -958,7 +958,7 @@ func (n *NodePlannableResourceInstance) generateHCLListResourceDef(ctx EvalConte
 		listElements = append(listElements, genconfig.ResourceListElement{Config: config, Identity: idVal})
 	}
 
-	return genconfig.GenerateListResourceContents(genconfig.UniqueAddr{Addr: addr, ExpansionCounter: n.expansionCounter}, schema.Body, schema.Identity, providerAddr, listElements)
+	return genconfig.GenerateListResourceContents(genconfig.UniqueAddr{Addr: addr, ExpansionEnum: n.expansionEnum}, schema.Body, schema.Identity, providerAddr, listElements)
 }
 
 func (n *NodePlannableResourceInstance) generateResourceConfig(ctx EvalContext, state cty.Value) (cty.Value, tfdiags.Diagnostics) {

internal/terraform/transform_resource_count.go

@@ -27,7 +27,7 @@ func (t *ResourceCountTransformer) Transform(g *Graph) error {
 	for idx, addr := range t.InstanceAddrs {
 		abstract := NewNodeAbstractResourceInstance(addr)
 		abstract.Schema = t.Schema
-		abstract.expansionCounter = idx
+		abstract.expansionEnum = idx
 		var node dag.Vertex = abstract
 		if f := t.Concrete; f != nil {
 			node = f(abstract)