inline back convertConfig

Author: lantoli

internal/convert/adv2v2.go

@@ -80,9 +80,34 @@ func convertRepSpecs(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) error
 		blockb := block.Body()
 		shardsAttr := blockb.GetAttribute(nNumShards)
 		blockb.RemoveAttribute(nNumShards)
-		if err := convertConfig(blockb, diskSizeGB); err != nil {
+
+		// Process config - inlined from convertConfig
+		dConfig, err := getDynamicBlock(blockb, nConfig)
+		if err != nil {
 			return err
 		}
+
+		if dConfig.IsPresent() {
+			blockName := getResourceName(dConfig.block)
+			transformReferences(dConfig.content.Body(), blockName, nRegion)
+			copyAttributesSorted(dConfig.content.Body(), dConfig.content.Body().Attributes())
+			processAllSpecs(dConfig.content.Body(), diskSizeGB)
+			tokens := hcl.TokensFromExpr(buildForExpr(nRegion, hcl.GetAttrExpr(dConfig.forEach), false))
+			tokens = append(tokens, hcl.TokensObject(dConfig.content.Body())...)
+			blockb.RemoveBlock(dConfig.block)
+			blockb.SetAttributeRaw(nConfig, hcl.EncloseBracketsNewLines(tokens))
+		} else {
+			var configs []*hclwrite.Body
+			for _, configBlock := range collectBlocks(blockb, nConfig) {
+				configBlockb := configBlock.Body()
+				processAllSpecs(configBlockb, diskSizeGB)
+				configs = append(configs, configBlockb)
+			}
+			if len(configs) == 0 {
+				return fmt.Errorf("replication_specs must have at least one region_configs")
+			}
+			blockb.SetAttributeRaw(nConfig, hcl.TokensArray(configs))
+		}
 		if hasVariableShards {
 			resultTokens = append(resultTokens, processNumShards(shardsAttr, blockb))
 			continue
@@ -161,35 +186,6 @@ func convertConfigsWithDynamicBlock(specbSrc *hclwrite.Body, diskSizeGB hclwrite
 	return dynamicBlock{tokens: hcl.TokensArraySingle(repSpecb)}, nil
 }
 
-func convertConfig(repSpecs *hclwrite.Body, diskSizeGB hclwrite.Tokens) error {
-	dConfig, err := getDynamicBlock(repSpecs, nConfig)
-	if err != nil {
-		return err
-	}
-	if dConfig.IsPresent() {
-		blockName := getResourceName(dConfig.block)
-		transformReferences(dConfig.content.Body(), blockName, nRegion)
-		copyAttributesSorted(dConfig.content.Body(), dConfig.content.Body().Attributes())
-		processAllSpecs(dConfig.content.Body(), diskSizeGB)
-		tokens := hcl.TokensFromExpr(buildForExpr(nRegion, hcl.GetAttrExpr(dConfig.forEach), false))
-		tokens = append(tokens, hcl.TokensObject(dConfig.content.Body())...)
-		repSpecs.RemoveBlock(dConfig.block)
-		repSpecs.SetAttributeRaw(nConfig, hcl.EncloseBracketsNewLines(tokens))
-		return nil
-	}
-	var configs []*hclwrite.Body
-	for _, block := range collectBlocks(repSpecs, nConfig) {
-		blockb := block.Body()
-		processAllSpecs(blockb, diskSizeGB)
-		configs = append(configs, blockb)
-	}
-	if len(configs) == 0 {
-		return fmt.Errorf("replication_specs must have at least one region_configs")
-	}
-	repSpecs.SetAttributeRaw(nConfig, hcl.TokensArray(configs))
-	return nil
-}
-
 // hasExpectedBlocksAsAttributes checks if any of the expected block names
 // exist as attributes in the resource body. In that case conversion is not done
 // as advanced cluster is not in a valid SDKv2 configuration.
@@ -217,9 +213,6 @@ func copyAttributesSorted(targetBody *hclwrite.Body, sourceAttrs map[string]*hcl
 		}
 		targetBody.SetAttributeRaw(name, hcl.TokensFromExpr(expr))
 	}
-	for _, block := range targetBody.Blocks() {
-		copyAttributesSorted(block.Body(), block.Body().Attributes(), transforms...)
-	}
 }
 
 func processAllSpecs(body *hclwrite.Body, diskSizeGB hclwrite.Tokens) {

internal/convert/shared.go

@@ -208,24 +208,19 @@ func extractTagsLabelsIndividual(resourceb *hclwrite.Body, name string) (hclwrit
 	var (
 		file  = hclwrite.NewEmptyFile()
 		fileb = file.Body()
-		found = false
 	)
-	for {
-		block := resourceb.FirstMatchingBlock(name, nil)
-		if block == nil {
-			break
-		}
+	blocks := collectBlocks(resourceb, name)
+	if len(blocks) == 0 {
+		return nil, nil
+	}
+	for _, block := range blocks {
 		key := block.Body().GetAttribute(nKey)
 		value := block.Body().GetAttribute(nValue)
 		if key == nil || value == nil {
 			return nil, fmt.Errorf("%s: %s or %s not found", name, nKey, nValue)
 		}
 		setKeyValue(fileb, key, value)
 		resourceb.RemoveBlock(block)
-		found = true
-	}
-	if !found {
-		return nil, nil
 	}
 	return hcl.TokensObject(fileb), nil
 }