change condition to make it clearer

Author: lantoli

internal/convert/convert.go

@@ -414,7 +414,7 @@ func getSpecs(configSrc *hclwrite.Block, countName string, root attrVals, isDyna
 	}
 	tokens := hcl.TokensObject(fileb)
 	if isDynamicBlock {
-		tokens = encloseDynamicBlockRegionSpec(tokens, countName)
+		tokens = append(hcl.TokensFromExpr(fmt.Sprintf("%s.%s == 0 ? null :", nRegion, countName)), tokens...)
 	}
 	return tokens, nil
 }
@@ -520,12 +520,6 @@ func replaceDynamicBlockExpr(attr *hclwrite.Attribute, blockName, attrName strin
 	return strings.ReplaceAll(expr, fmt.Sprintf("%s.%s", blockName, attrName), attrName)
 }
 
-func encloseDynamicBlockRegionSpec(specTokens hclwrite.Tokens, countName string) hclwrite.Tokens {
-	tokens := hcl.TokensFromExpr(fmt.Sprintf("%s.%s > 0 ?", nRegion, countName))
-	tokens = append(tokens, specTokens...)
-	return append(tokens, hcl.TokensFromExpr(": null")...)
-}
-
 // getDynamicBlockRegionConfigsRegionArray returns the region array for a dynamic block in replication_specs.
 // e.g. [ for region in var.replication_specs.regions_config : { ... } if priority == region.priority ]
 func getDynamicBlockRegionConfigsRegionArray(d dynamicBlock, root attrVals) (hclwrite.Tokens, error) {

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

@@ -23,27 +23,27 @@ resource "mongodbatlas_advanced_cluster" "cluster" {
             provider_name = var.provider_name
             region_name   = region.region_name
             priority      = region.priority
-            electable_specs = region.electable_nodes > 0 ? {
+            electable_specs = region.electable_nodes == 0 ? null : {
               node_count      = region.electable_nodes
               instance_size   = var.provider_instance_size_name
               disk_size_gb    = var.disk_size_gb
               ebs_volume_type = var.provider_volume_type
               disk_iops       = var.provider_disk_iops
-            } : null
-            read_only_specs = region.read_only_nodes > 0 ? {
+            }
+            read_only_specs = region.read_only_nodes == 0 ? null : {
               node_count      = region.read_only_nodes
               instance_size   = var.provider_instance_size_name
               disk_size_gb    = var.disk_size_gb
               ebs_volume_type = var.provider_volume_type
               disk_iops       = var.provider_disk_iops
-            } : null
-            analytics_specs = region.analytics_nodes > 0 ? {
+            }
+            analytics_specs = region.analytics_nodes == 0 ? null : {
               node_count      = region.analytics_nodes
               instance_size   = var.provider_instance_size_name
               disk_size_gb    = var.disk_size_gb
               ebs_volume_type = var.provider_volume_type
               disk_iops       = var.provider_disk_iops
-            } : null
+            }
             auto_scaling = {
               disk_gb_enabled = var.auto_scaling_disk_gb_enabled
             }

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

@@ -12,14 +12,14 @@ resource "mongodbatlas_advanced_cluster" "dynamic_regions_config" {
             provider_name = "AWS"
             region_name   = region.region_name
             priority      = region.prio
-            electable_specs = region.electable_nodes > 0 ? {
+            electable_specs = region.electable_nodes == 0 ? null : {
               node_count    = region.electable_nodes
               instance_size = "M10"
-            } : null
-            read_only_specs = region.read_only_nodes > 0 ? {
+            }
+            read_only_specs = region.read_only_nodes == 0 ? null : {
               node_count    = region.read_only_nodes
               instance_size = "M10"
-            } : null
+            }
           } if priority == region.prio
         ]
       ])