collectBlocks

Author: lantoli

internal/convert/adv2v2.go

@@ -68,15 +68,7 @@ func convertRepSpecs(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) error
 	}
 
 	// Collect all replication_specs blocks first
-	var repSpecBlocks []*hclwrite.Block
-	for {
-		block := resourceb.FirstMatchingBlock(nRepSpecs, nil)
-		if block == nil {
-			break
-		}
-		resourceb.RemoveBlock(block)
-		repSpecBlocks = append(repSpecBlocks, block)
-	}
+	repSpecBlocks := collectBlocks(resourceb, nRepSpecs)
 
 	if len(repSpecBlocks) == 0 {
 		return fmt.Errorf("must have at least one replication_specs")
@@ -372,12 +364,7 @@ func convertConfig(repSpecs *hclwrite.Body, diskSizeGB hclwrite.Tokens) error {
 	}
 
 	var configs []*hclwrite.Body
-	for {
-		block := repSpecs.FirstMatchingBlock(nConfig, nil)
-		if block == nil {
-			break
-		}
-		repSpecs.RemoveBlock(block)
+	for _, block := range collectBlocks(repSpecs, nConfig) {
 		blockb := block.Body()
 		processAllSpecs(blockb, diskSizeGB)
 		configs = append(configs, blockb)
@@ -410,19 +397,6 @@ func convertDynamicConfig(repSpecs *hclwrite.Body, dConfig dynamicBlock, diskSiz
 	return nil
 }
 
-func transformDynamicBlockReferencesRecursive(body *hclwrite.Body, blockName, varName string) {
-	// Transform attributes in deterministic order
-	transform := func(expr string) string {
-		return replaceDynamicBlockReferences(expr, blockName, varName)
-	}
-	transformAttributesSorted(body, body.Attributes(), transform)
-
-	// Transform nested blocks
-	for _, block := range body.Blocks() {
-		transformDynamicBlockReferencesRecursive(block.Body(), blockName, varName)
-	}
-}
-
 // 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.

internal/convert/clu2adv.go

@@ -183,15 +183,7 @@ func fillReplicationSpecs(resourceb *hclwrite.Body, root attrVals) error {
 	}
 
 	// Collect all replication_specs blocks first
-	var repSpecBlocks []*hclwrite.Block
-	for {
-		block := resourceb.FirstMatchingBlock(nRepSpecs, nil)
-		if block == nil {
-			break
-		}
-		resourceb.RemoveBlock(block)
-		repSpecBlocks = append(repSpecBlocks, block)
-	}
+	repSpecBlocks := collectBlocks(resourceb, nRepSpecs)
 
 	if len(repSpecBlocks) == 0 {
 		return fmt.Errorf("%s: no replication_specs found", errRepSpecs)

internal/convert/shared.go

@@ -106,6 +106,35 @@ func transformDynamicBlockReferences(configSrcb *hclwrite.Body, blockName, varNa
 	}
 }
 
+// transformDynamicBlockReferencesRecursive transforms attributes and nested blocks recursively
+// replacing references from dynamic block format, e.g. regions_config.value.* to region.*
+func transformDynamicBlockReferencesRecursive(body *hclwrite.Body, blockName, varName string) {
+	// Transform attributes in deterministic order
+	transform := func(expr string) string {
+		return replaceDynamicBlockReferences(expr, blockName, varName)
+	}
+	transformAttributesSorted(body, body.Attributes(), transform)
+
+	// Transform nested blocks
+	for _, block := range body.Blocks() {
+		transformDynamicBlockReferencesRecursive(block.Body(), blockName, varName)
+	}
+}
+
+// collectBlocks removes and returns all blocks of the given name from body in order of appearance.
+func collectBlocks(body *hclwrite.Body, name string) []*hclwrite.Block {
+	var blocks []*hclwrite.Block
+	for {
+		block := body.FirstMatchingBlock(name, nil)
+		if block == nil {
+			break
+		}
+		body.RemoveBlock(block)
+		blocks = append(blocks, block)
+	}
+	return blocks
+}
+
 // fillBlockOpt converts a block to an attribute with object value
 func fillBlockOpt(resourceb *hclwrite.Body, name string) {
 	block := resourceb.FirstMatchingBlock(name, nil)