refactor buildForExpr

Author: lantoli

internal/convert/adv2v2.go

@@ -171,9 +171,9 @@ func convertDynamicRepSpecs(resourceb *hclwrite.Body, dSpec dynamicBlock, diskSi
 		}
 
 		// Create the for expression for the flattened replication_specs
-		outerFor := buildForExpression(nSpec, hcl.GetAttrExpr(dSpec.forEach))
-		innerFor := buildForExpressionWithIndex("i", fmt.Sprintf("range(%s)", numShardsExpr))
-		forExpr := fmt.Sprintf("%s [\n    %s", outerFor, innerFor)
+		outerFor := buildForExpr(nSpec, hcl.GetAttrExpr(dSpec.forEach))
+		innerFor := buildForExpr("i", fmt.Sprintf("range(%s)", numShardsExpr))
+		forExpr := fmt.Sprintf("%s [\n    %s ", outerFor, innerFor)
 		tokens := hcl.TokensFromExpr(forExpr)
 		tokens = append(tokens, hcl.TokensObject(dSpec.content.Body())...)
 		tokens = append(tokens, hcl.TokensFromExpr("\n  ]\n]")...)
@@ -191,7 +191,7 @@ func convertDynamicRepSpecs(resourceb *hclwrite.Body, dSpec dynamicBlock, diskSi
 	}
 
 	// Create the for expression without num_shards
-	forExpr := buildForExpression(nSpec, hcl.GetAttrExpr(dSpec.forEach))
+	forExpr := buildForExpr(nSpec, hcl.GetAttrExpr(dSpec.forEach))
 	tokens := hcl.TokensFromExpr(forExpr)
 	tokens = append(tokens, hcl.TokensObject(dSpec.content.Body())...)
 	tokens = hcl.EncloseBracketsNewLines(tokens)
@@ -257,7 +257,7 @@ func convertDynamicRepSpecsWithDynamicConfig(resourceb *hclwrite.Body, dSpec, dC
 		processRegionConfigBlocks(regionConfigBody, dConfig.content.Body().Blocks(), diskSizeGB)
 
 		// Build the region_configs for expression
-		regionForExpr := buildForExpression(nRegion, configForEach)
+		regionForExpr := buildForExpr(nRegion, configForEach)
 		regionTokens := hcl.TokensFromExpr(regionForExpr)
 		regionTokens = append(regionTokens, hcl.TokensObject(regionConfigBody)...)
 
@@ -273,13 +273,13 @@ func convertDynamicRepSpecsWithDynamicConfig(resourceb *hclwrite.Body, dSpec, dC
 		repSpecBody.SetAttributeRaw(nConfig, hcl.EncloseBracketsNewLines(regionTokens))
 
 		// Build the inner for expression with range
-		innerForExpr := buildForExpressionWithIndex("i", fmt.Sprintf("range(%s)", numShardsExpr))
+		innerForExpr := buildForExpr("i", fmt.Sprintf("range(%s)", numShardsExpr))
 		innerTokens := hcl.TokensFromExpr(innerForExpr)
 		innerTokens = append(innerTokens, hcl.TokensObject(repSpecBody)...)
 
 		// Build the outer for expression
-		outerForExpr := buildForExpression(nSpec, hcl.GetAttrExpr(dSpec.forEach))
-		outerTokens := hcl.TokensFromExpr(outerForExpr)
+		outerForExpr := buildForExpr(nSpec, hcl.GetAttrExpr(dSpec.forEach))
+		outerTokens := hcl.TokensFromExpr(fmt.Sprintf("%s ", outerForExpr))
 		outerTokens = append(outerTokens, hcl.EncloseBracketsNewLines(innerTokens)...)
 
 		// Apply flatten to the entire expression
@@ -339,16 +339,16 @@ func convertDynamicRepSpecsWithoutNumShards(resourceb *hclwrite.Body, dSpec, dCo
 	configForEach := fmt.Sprintf("%s.%s", nSpec, nConfig)
 
 	// Build the region_configs for expression
-	regionForExpr := buildForExpression(nRegion, configForEach)
+	regionForExpr := buildForExpr(nRegion, configForEach)
 	regionTokens := hcl.TokensFromExpr(regionForExpr)
 	regionTokens = append(regionTokens, hcl.TokensObject(configb)...)
 
 	repSpecb.SetAttributeRaw(nConfig, hcl.EncloseBracketsNewLines(regionTokens))
 
 	// Build the for expression as an array wrapped in flatten
 	// Format: flatten([for spec in ... : [ { ... } ] ])
-	forExpr := buildForExpression(nSpec, hcl.GetAttrExpr(dSpec.forEach))
-	innerTokens := hcl.TokensFromExpr(forExpr)
+	forExpr := buildForExpr(nSpec, hcl.GetAttrExpr(dSpec.forEach))
+	innerTokens := hcl.TokensFromExpr(fmt.Sprintf("%s ", forExpr))
 	innerTokens = append(innerTokens, hcl.TokensArraySingle(repSpecb)...)
 
 	// Apply flatten to the entire expression
@@ -406,7 +406,7 @@ func convertDynamicConfig(repSpecs *hclwrite.Body, dConfig dynamicBlock, diskSiz
 	processAllSpecs(dConfig.content.Body(), diskSizeGB)
 
 	// Build the for expression
-	forExpr := buildForExpression(nRegion, hcl.GetAttrExpr(dConfig.forEach))
+	forExpr := buildForExpr(nRegion, hcl.GetAttrExpr(dConfig.forEach))
 	tokens := hcl.TokensFromExpr(forExpr)
 	tokens = append(tokens, hcl.TokensObject(dConfig.content.Body())...)
 	tokens = hcl.EncloseBracketsNewLines(tokens)

internal/convert/clu2adv.go

@@ -371,7 +371,7 @@ func fillReplicationSpecsWithDynamicBlock(resourceb *hclwrite.Body, root attrVal
 	if err != nil {
 		return dynamicBlock{}, err
 	}
-	forSpec := hcl.TokensFromExpr(buildForExpression(nSpec, hcl.GetAttrExpr(dSpec.forEach)))
+	forSpec := hcl.TokensFromExpr(fmt.Sprintf("%s ", buildForExpr(nSpec, hcl.GetAttrExpr(dSpec.forEach))))
 	forSpec = append(forSpec, dConfig.tokens...)
 	tokens := hcl.TokensFuncFlatten(forSpec)
 	dSpec.tokens = tokens
@@ -397,17 +397,17 @@ func fillWithDynamicRegionConfigs(specbSrc *hclwrite.Body, root attrVals, change
 	if err != nil {
 		return dynamicBlock{}, err
 	}
-	priorityForStr := buildForExpression(nPriority, fmt.Sprintf("range(%d, %d, -1)", valMaxPriority, valMinPriority))
+	priorityForStr := buildForExpr(nPriority, fmt.Sprintf("range(%d, %d, -1)", valMaxPriority, valMinPriority))
 	priorityFor := hcl.TokensComment(commentPriorityFor)
-	priorityFor = append(priorityFor, hcl.TokensFromExpr(priorityForStr)...)
+	priorityFor = append(priorityFor, hcl.TokensFromExpr(fmt.Sprintf("%s ", priorityForStr))...)
 	priorityFor = append(priorityFor, regionFor...)
 	repSpecb.SetAttributeRaw(nConfig, hcl.TokensFuncFlatten(priorityFor))
 
 	shards := specbSrc.GetAttribute(nNumShards)
 	if shards == nil {
 		return dynamicBlock{}, fmt.Errorf("%s: %s not found", errRepSpecs, nNumShards)
 	}
-	tokens := hcl.TokensFromExpr(buildForExpressionWithIndex("i", fmt.Sprintf("range(%s)", hcl.GetAttrExpr(shards))))
+	tokens := hcl.TokensFromExpr(buildForExpr("i", fmt.Sprintf("range(%s)", hcl.GetAttrExpr(shards))))
 	tokens = append(tokens, hcl.EncloseBraces(repSpec.BuildTokens(nil), true)...)
 	d.tokens = hcl.EncloseBracketsNewLines(tokens)
 	return d, nil
@@ -563,7 +563,7 @@ func getDynamicBlockRegionArray(forEach string, configSrc *hclwrite.Block, root
 	if err != nil {
 		return nil, err
 	}
-	tokens := hcl.TokensFromExpr(buildForExpression(nRegion, forEach))
+	tokens := hcl.TokensFromExpr(buildForExpr(nRegion, forEach))
 	tokens = append(tokens, hcl.EncloseBraces(region.BuildTokens(nil), true)...)
 	tokens = append(tokens, hcl.TokensFromExpr(fmt.Sprintf("if %s == %s", nPriority, priorityStr))...)
 	return hcl.EncloseBracketsNewLines(tokens), nil

internal/convert/shared.go

@@ -186,12 +186,7 @@ func fillSpecOpt(resourceb *hclwrite.Body, name string, diskSizeGBTokens hclwrit
 	fillBlockOpt(resourceb, name)
 }
 
-// buildForExpression builds a for expression with the given variable and collection
-func buildForExpression(varName, collection string) string {
-	return fmt.Sprintf("for %s in %s : ", varName, collection)
-}
-
-// buildForExpressionWithIndex builds a for expression with an index variable
-func buildForExpressionWithIndex(indexVar, collection string) string {
-	return fmt.Sprintf("for %s in %s : ", indexVar, collection)
+// buildForExpr builds a for expression with the given variable and collection
+func buildForExpr(varName, collection string) string {
+	return fmt.Sprintf("for %s in %s :", varName, collection)
 }