refactor specs

Author: lantoli

internal/convert/adv2v2.go

@@ -8,6 +8,11 @@ import (
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/hcl"
 )
 
+var (
+	specsWithDisk    = []string{nElectableSpecs, nReadOnlySpecs, nAnalyticsSpecs}
+	specsWithoutDisk = []string{nAutoScaling, nAnalyticsAutoScaling}
+)
+
 // AdvancedClusterToV2 transforms all mongodbatlas_advanced_cluster resource definitions in a
 // Terraform configuration file from SDKv2 schema to TPF (Terraform Plugin Framework) schema.
 // All other resources and data sources are left untouched.
@@ -198,31 +203,22 @@ func copyAttributesSorted(targetBody *hclwrite.Body, sourceAttrs map[string]*hcl
 }
 
 func processAllSpecs(body *hclwrite.Body, diskSizeGB hclwrite.Tokens) {
-	specsWithDisk := []string{nElectableSpecs, nReadOnlySpecs, nAnalyticsSpecs}
 	for _, spec := range specsWithDisk {
 		fillSpecOpt(body, spec, diskSizeGB)
 	}
-	specsWithoutDisk := []string{nAutoScaling, nAnalyticsAutoScaling}
 	for _, spec := range specsWithoutDisk {
 		fillSpecOpt(body, spec, nil)
 	}
 }
 
 func processConfigForDynamicBlock(configBlockb *hclwrite.Body, diskSizeGB hclwrite.Tokens) *hclwrite.Body {
 	newConfigBody := hclwrite.NewEmptyFile().Body()
-	attrs := configBlockb.Attributes()
-	orderedAttrs := []string{nPriority, nProviderName, nRegionName}
-	for _, attrName := range orderedAttrs {
-		if attr := attrs[attrName]; attr != nil {
-			newConfigBody.SetAttributeRaw(attrName, attr.Expr().BuildTokens(nil))
-		}
-	}
+	copyAttributesSorted(newConfigBody, configBlockb.Attributes())
 	for _, block := range configBlockb.Blocks() {
 		blockType := block.Type()
 		blockBody := hclwrite.NewEmptyFile().Body()
 		copyAttributesSorted(blockBody, block.Body().Attributes())
-		if diskSizeGB != nil &&
-			(blockType == nElectableSpecs || blockType == nReadOnlySpecs || blockType == nAnalyticsSpecs) {
+		if diskSizeGB != nil && slices.Contains(specsWithDisk, blockType) {
 			blockBody.SetAttributeRaw(nDiskSizeGB, diskSizeGB)
 		}
 		newConfigBody.SetAttributeRaw(blockType, hcl.TokensObject(blockBody))

internal/convert/clu2adv.go

@@ -314,36 +314,27 @@ func getRegionConfig(configSrc *hclwrite.Block, root attrVals, isDynamicBlock bo
 	if err := hcl.MoveAttr(configSrc.Body(), fileb, nPriority, nPriority, errRepSpecs); err != nil {
 		return nil, err
 	}
-	// Process all spec types
-	specMappings := []struct {
-		nodeName string
-		specName string
-	}{
-		{nElectableNodes, nElectableSpecs},
-		{nReadOnlyNodes, nReadOnlySpecs},
-		{nAnalyticsNodes, nAnalyticsSpecs},
-	}
-	for _, mapping := range specMappings {
-		if spec, _ := getSpec(configSrc, mapping.nodeName, root, isDynamicBlock); spec != nil {
-			fileb.SetAttributeRaw(mapping.specName, spec)
-		}
-	}
+	processSpec(fileb, configSrc, nElectableSpecs, nElectableNodes, root, isDynamicBlock)
+	processSpec(fileb, configSrc, nReadOnlySpecs, nReadOnlyNodes, root, isDynamicBlock)
+	processSpec(fileb, configSrc, nAnalyticsSpecs, nAnalyticsNodes, root, isDynamicBlock)
+
 	if autoScaling := getAutoScalingOpt(root.opt); autoScaling != nil {
 		fileb.SetAttributeRaw(nAutoScaling, autoScaling)
 	}
 	return fileb, nil
 }
 
-func getSpec(configSrc *hclwrite.Block, countName string, root attrVals, isDynamicBlock bool) (hclwrite.Tokens, error) {
+func processSpec(configb *hclwrite.Body, configSrc *hclwrite.Block,
+	specName, countName string, root attrVals, isDynamicBlock bool) {
 	var (
 		fileb = hclwrite.NewEmptyFile().Body()
 		count = configSrc.Body().GetAttribute(countName)
 	)
 	if count == nil {
-		return nil, fmt.Errorf("%s: attribute %s not found", errRepSpecs, countName)
+		return
 	}
 	if countVal, errVal := hcl.GetAttrInt(count, errRepSpecs); countVal == 0 && errVal == nil {
-		return nil, fmt.Errorf("%s: attribute %s is 0", errRepSpecs, countName)
+		return
 	}
 	fileb.SetAttributeRaw(nNodeCount, count.Expr().BuildTokens(nil))
 	fileb.SetAttributeRaw(nInstanceSize, root.req[nInstanceSizeSrc])
@@ -360,7 +351,7 @@ func getSpec(configSrc *hclwrite.Block, countName string, root attrVals, isDynam
 	if isDynamicBlock {
 		tokens = append(hcl.TokensFromExpr(fmt.Sprintf("%s == 0 ? null :", hcl.GetAttrExpr(count))), tokens...)
 	}
-	return tokens, nil
+	configb.SetAttributeRaw(specName, tokens)
 }
 
 func getAutoScalingOpt(opt map[string]hclwrite.Tokens) hclwrite.Tokens {

internal/convert/shared.go

@@ -177,24 +177,21 @@ func fillAdvConfigOpt(resourceb *hclwrite.Body) {
 	fillBlockOpt(resourceb, nAdvConfig)
 }
 
-// processCommonOptionalBlocks processes tags, labels, and other optional blocks
-// This function is used by both adv2v2 and clu2adv conversions
+// processCommonOptionalBlocks processes tags, labels, and other optional blocks.
 func processCommonOptionalBlocks(resourceb *hclwrite.Body) error {
-	// Process tags and labels
 	for _, name := range []string{nTags, nLabels} {
 		if err := fillTagsLabelsOpt(resourceb, name); err != nil {
 			return err
 		}
 	}
-	// Process optional configuration blocks
 	fillAdvConfigOpt(resourceb)
 	for _, name := range []string{nBiConnector, nPinnedFCV, nTimeouts} {
 		fillBlockOpt(resourceb, name)
 	}
 	return nil
 }
 
-// buildForExpr builds a for expression with the given variable and collection
+// buildForExpr builds a for expression with the given variable and collection.
 func buildForExpr(varName, collection string, trailingSpace bool) string {
 	expr := fmt.Sprintf("for %s in %s :", varName, collection)
 	if trailingSpace {