use hcl.TokensFuncFlatten

Author: lantoli

internal/convert/adv2v2.go

@@ -3,7 +3,6 @@ package convert
 import (
 	"fmt"
 	"slices"
-	"strings"
 
 	"github.com/hashicorp/hcl/v2/hclwrite"
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/hcl"
@@ -275,21 +274,10 @@ func convertDynamicRepSpecsWithDynamicConfig(resourceb *hclwrite.Body, dSpec, dC
 
 		// Build the expression using HCL functions
 		configForEach := replaceDynamicBlockReferences(hcl.GetAttrExpr(dConfig.forEach), nRepSpecs, nSpec)
-		zoneNameExpr := ""
-		if zoneNameAttr := dSpec.content.Body().GetAttribute(nZoneName); zoneNameAttr != nil {
-			zoneNameExpr = replaceDynamicBlockReferences(hcl.GetAttrExpr(zoneNameAttr), nRepSpecs, nSpec)
-		}
 
-		// Build the nested expression string
-		var exprStr strings.Builder
-		exprStr.WriteString("flatten([\n")
-		exprStr.WriteString(fmt.Sprintf("    for %s in %s : [\n", nSpec, hcl.GetAttrExpr(dSpec.forEach)))
-		exprStr.WriteString(fmt.Sprintf("      for i in range(%s) : {\n", numShardsExpr))
-		if zoneNameExpr != "" {
-			exprStr.WriteString(fmt.Sprintf("        zone_name = %s\n", zoneNameExpr))
-		}
-		exprStr.WriteString("        region_configs = [\n")
-		exprStr.WriteString(fmt.Sprintf("          for %s in %s : {\n", nRegion, configForEach))
+		// Create the inner region_configs body
+		regionConfigFile := hclwrite.NewEmptyFile()
+		regionConfigBody := regionConfigFile.Body()
 
 		// Add all attributes generically in alphabetical order
 		attrs := dConfig.content.Body().Attributes()
@@ -301,13 +289,16 @@ func convertDynamicRepSpecsWithDynamicConfig(resourceb *hclwrite.Body, dSpec, dC
 
 		for _, name := range attrNames {
 			attr := attrs[name]
-			exprStr.WriteString(fmt.Sprintf("            %s = %s\n", name, hcl.GetAttrExpr(attr)))
+			regionConfigBody.SetAttributeRaw(name, hcl.TokensFromExpr(hcl.GetAttrExpr(attr)))
 		}
 
 		// Add all blocks generically as objects
 		for _, block := range dConfig.content.Body().Blocks() {
 			blockType := block.Type()
-			exprStr.WriteString(fmt.Sprintf("            %s = {\n", blockType))
+
+			// Create a new body for the block
+			blockFile := hclwrite.NewEmptyFile()
+			blockBody := blockFile.Body()
 
 			// Add block attributes in alphabetical order
 			blockAttrs := block.Body().Attributes()
@@ -319,18 +310,40 @@ func convertDynamicRepSpecsWithDynamicConfig(resourceb *hclwrite.Body, dSpec, dC
 
 			for _, attrName := range blockAttrNames {
 				attr := blockAttrs[attrName]
-				exprStr.WriteString(fmt.Sprintf("              %s = %s\n", attrName, hcl.GetAttrExpr(attr)))
+				blockBody.SetAttributeRaw(attrName, hcl.TokensFromExpr(hcl.GetAttrExpr(attr)))
 			}
-			exprStr.WriteString("            }\n")
+
+			regionConfigBody.SetAttributeRaw(blockType, hcl.TokensObject(blockBody))
+		}
+
+		// Build the region_configs for expression
+		regionForExpr := fmt.Sprintf("for %s in %s :", nRegion, configForEach)
+		regionTokens := hcl.TokensFromExpr(regionForExpr)
+		regionTokens = append(regionTokens, hcl.TokensObject(regionConfigBody)...)
+
+		// Create the replication spec body
+		repSpecFile := hclwrite.NewEmptyFile()
+		repSpecBody := repSpecFile.Body()
+
+		if zoneNameAttr := dSpec.content.Body().GetAttribute(nZoneName); zoneNameAttr != nil {
+			zoneNameExpr := replaceDynamicBlockReferences(hcl.GetAttrExpr(zoneNameAttr), nRepSpecs, nSpec)
+			repSpecBody.SetAttributeRaw(nZoneName, hcl.TokensFromExpr(zoneNameExpr))
 		}
 
-		exprStr.WriteString("          }\n")
-		exprStr.WriteString("        ]\n")
-		exprStr.WriteString("      }\n")
-		exprStr.WriteString("    ]\n")
-		exprStr.WriteString("  ])")
+		repSpecBody.SetAttributeRaw(nConfig, hcl.EncloseBracketsNewLines(regionTokens))
+
+		// Build the inner for expression with range
+		innerForExpr := fmt.Sprintf("for i in range(%s) :", numShardsExpr)
+		innerTokens := hcl.TokensFromExpr(innerForExpr)
+		innerTokens = append(innerTokens, hcl.TokensObject(repSpecBody)...)
+
+		// Build the outer for expression
+		outerForExpr := fmt.Sprintf("for %s in %s : ", nSpec, hcl.GetAttrExpr(dSpec.forEach))
+		outerTokens := hcl.TokensFromExpr(outerForExpr)
+		outerTokens = append(outerTokens, hcl.EncloseBracketsNewLines(innerTokens)...)
 
-		tokens := hcl.TokensFromExpr(exprStr.String())
+		// Apply flatten to the entire expression
+		tokens := hcl.TokensFuncFlatten(outerTokens)
 
 		resourceb.RemoveBlock(dSpec.block)
 		resourceb.SetAttributeRaw(nRepSpecs, tokens)

internal/convert/testdata/adv2v2/dynamic_replication_specs_basic.out.tf

@@ -1,23 +1,23 @@
 resource "mongodbatlas_advanced_cluster" "dynamic_replication_specs" {
-  project_id        = var.project_id
-  name              = var.cluster_name
-  cluster_type      = "GEOSHARDED"
+  project_id   = var.project_id
+  name         = var.cluster_name
+  cluster_type = "GEOSHARDED"
   replication_specs = flatten([
     for spec in var.replication_specs : [
       for i in range(spec.num_shards) : {
         zone_name = spec.zone_name
         region_configs = [
           for region in spec.region_configs : {
-            priority = region.priority
+            priority      = region.priority
             provider_name = region.provider_name
-            region_name = region.region_name
+            region_name   = region.region_name
             electable_specs = {
               instance_size = region.instance_size
-              node_count = region.electable_node_count
+              node_count    = region.electable_node_count
             }
             read_only_specs = {
               instance_size = region.instance_size
-              node_count = region.read_only_node_count
+              node_count    = region.read_only_node_count
             }
           }
         ]