fix region_configs name replacement

Author: lantoli

internal/convert/const_names.go

@@ -54,4 +54,5 @@ const (
 	nDynamic                    = "dynamic"
 	nForEach                    = "for_each"
 	nContent                    = "content"
+	nRegion                     = "region"
 )

internal/convert/convert.go

@@ -264,8 +264,8 @@ func extractTagsLabelsDynamicBlock(resourceb *hclwrite.Body, name string) (hclwr
 	if key == nil || value == nil {
 		return nil, fmt.Errorf("dynamic block %s: %s or %s not found", name, nKey, nValue)
 	}
-	keyExpr := replaceDynamicBlockExpr(key, nKey, name, "")
-	valueExpr := replaceDynamicBlockExpr(value, nValue, name, "")
+	keyExpr := replaceDynamicBlockExpr(key, name, nKey)
+	valueExpr := replaceDynamicBlockExpr(value, name, nValue)
 	collectionExpr := hcl.GetAttrExpr(d.forEach)
 	forExpr := fmt.Sprintf("for key, value in %s : %s => %s", collectionExpr, keyExpr, valueExpr)
 	tokens := hcl.TokensObjectFromExpr(forExpr)
@@ -321,16 +321,24 @@ func fillRegionConfigsDynamicBlock(specbSrc *hclwrite.Body, root attrVals) (dyna
 		return dynamicBlock{}, fmt.Errorf("%s: %s not found", errRepSpecs, nNumShards)
 	}
 	zoneName := hcl.GetAttrExpr(specbSrc.GetAttribute(nZoneName))
-	const nRegion = "region"
 	configSrc := d.content
 	configSrcb := configSrc.Body()
+	var priorityStr string
 
-	oldPrefix := fmt.Sprintf("%s.%s", nConfigSrc, nValue)
 	// Change value references in all attributes, e.g. regions_config.value.electable_nodes to region.electable_nodes
 	for name, attr := range configSrcb.Attributes() {
-		expr := replaceDynamicBlockExpr(attr, name, oldPrefix, nRegion)
+		expr := hcl.GetAttrExpr(attr)
+		expr = strings.ReplaceAll(expr,
+			fmt.Sprintf("%s.%s.", nConfigSrc, nValue),
+			fmt.Sprintf("%s.", nRegion))
+		if name == nPriority {
+			priorityStr = expr
+		}
 		configSrcb.SetAttributeRaw(name, hcl.TokensFromExpr(expr))
 	}
+	if priorityStr == "" {
+		return dynamicBlock{}, fmt.Errorf("%s: %s not found", errRepSpecs, nPriority)
+	}
 	region, err := getRegionConfig(configSrc, root, true)
 	if err != nil {
 		return dynamicBlock{}, err
@@ -343,7 +351,7 @@ func fillRegionConfigsDynamicBlock(specbSrc *hclwrite.Body, root attrVals) (dyna
 	}
 	config := region.BuildTokens(nil)
 	config = hcl.EncloseBraces(config, true)
-	config = append(config, hcl.TokensFromExpr("if region.priority == priority")...)
+	config = append(config, hcl.TokensFromExpr(fmt.Sprintf("if priority == %s", priorityStr))...)
 	forRegion := hcl.TokensFromExpr(fmt.Sprintf("for region in %s :", hcl.GetAttrExpr(d.forEach)))
 	forRegion = append(forRegion, config...)
 
@@ -546,13 +554,9 @@ func getDynamicBlock(body *hclwrite.Body, name string) (dynamicBlock, error) {
 	return dynamicBlock{}, nil
 }
 
-func replaceDynamicBlockExpr(attr *hclwrite.Attribute, attrName, oldPrefix, newPrefix string) string {
+func replaceDynamicBlockExpr(attr *hclwrite.Attribute, blockName, attrName string) string {
 	expr := hcl.GetAttrExpr(attr)
-	newStr := attrName
-	if newPrefix != "" {
-		newStr = fmt.Sprintf("%s.%s", newPrefix, attrName)
-	}
-	return strings.ReplaceAll(expr, fmt.Sprintf("%s.%s", oldPrefix, attrName), newStr)
+	return strings.ReplaceAll(expr, fmt.Sprintf("%s.%s", blockName, attrName), attrName)
 }
 
 func sortConfigsByPriority(configs []*hclwrite.Body) []*hclwrite.Body {

internal/convert/testdata/clu2adv/dynamic_regions_config_auto_scaling.out.tf

@@ -39,7 +39,7 @@ resource "mongodbatlas_advanced_cluster" "cluster" {
             auto_scaling = {
               disk_gb_enabled = var.auto_scaling_disk_gb_enabled
             }
-          } if region.priority == priority
+          } if priority == region.priority
         ]
       ])
     }

…ata/clu2adv/dynamic_regions_config.in.tf …u2adv/dynamic_regions_config_basic.in.tfinternal/convert/testdata/clu2adv/dynamic_regions_config.in.tf renamed to internal/convert/testdata/clu2adv/dynamic_regions_config_basic.in.tf internal/convert/testdata/clu2adv/dynamic_regions_config.in.tf renamed to internal/convert/testdata/clu2adv/dynamic_regions_config_basic.in.tf

@@ -6,13 +6,13 @@ resource "mongodbatlas_cluster" "dynamic_regions_config" {
   provider_instance_size_name = "M10"
   replication_specs {
     num_shards = var.replication_specs.num_shards
-    zone_name  = "Zone 1"
+    zone_name  = var.zone_name
     dynamic "regions_config" {
       for_each = var.replication_specs.regions_config
       content {
         region_name     = regions_config.value.region_name
         electable_nodes = regions_config.value.electable_nodes
-        priority        = regions_config.value.priority
+        priority        = regions_config.value.prio
         read_only_nodes = regions_config.value.read_only_nodes
       }
     }
@@ -26,7 +26,7 @@ variable "replication_specs" {
     regions_config = set(object({
       region_name     = string
       electable_nodes = number
-      priority        = number
+      prio            = number
       read_only_nodes = number
     }))
   })
@@ -36,13 +36,13 @@ variable "replication_specs" {
       {
         region_name     = "US_EAST_1"
         electable_nodes = 3
-        priority        = 7
+        prio            = 7
         read_only_nodes = 0
       },
       {
         region_name     = "US_WEST_2"
         electable_nodes = 2
-        priority        = 6
+        prio            = 6
         read_only_nodes = 1
       }
     ]

…ta/clu2adv/dynamic_regions_config.out.tf …2adv/dynamic_regions_config_basic.out.tfinternal/convert/testdata/clu2adv/dynamic_regions_config.out.tf renamed to internal/convert/testdata/clu2adv/dynamic_regions_config_basic.out.tf internal/convert/testdata/clu2adv/dynamic_regions_config.out.tf renamed to internal/convert/testdata/clu2adv/dynamic_regions_config_basic.out.tf

@@ -4,13 +4,13 @@ resource "mongodbatlas_advanced_cluster" "dynamic_regions_config" {
   cluster_type = "SHARDED"
   replication_specs = [
     for i in range(var.replication_specs.num_shards) : {
-      zone_name = "Zone 1"
+      zone_name = var.zone_name
       region_configs = flatten([
         for priority in range(7, 0, -1) : [
           for region in var.replication_specs.regions_config : {
             provider_name = "AWS"
             region_name   = region.region_name
-            priority      = region.priority
+            priority      = region.prio
             electable_specs = region.electable_nodes > 0 ? {
               node_count    = region.electable_nodes
               instance_size = "M10"
@@ -19,7 +19,7 @@ resource "mongodbatlas_advanced_cluster" "dynamic_regions_config" {
               node_count    = region.read_only_nodes
               instance_size = "M10"
             } : null
-          } if region.priority == priority
+          } if priority == region.prio
         ]
       ])
     }
@@ -36,7 +36,7 @@ variable "replication_specs" {
     regions_config = set(object({
       region_name     = string
       electable_nodes = number
-      priority        = number
+      prio            = number
       read_only_nodes = number
     }))
   })
@@ -46,13 +46,13 @@ variable "replication_specs" {
       {
         region_name     = "US_EAST_1"
         electable_nodes = 3
-        priority        = 7
+        prio            = 7
         read_only_nodes = 0
       },
       {
         region_name     = "US_WEST_2"
         electable_nodes = 2
-        priority        = 6
+        prio            = 6
         read_only_nodes = 1
       }
     ]