check only one block in getDynamicBlock

Author: lantoli

internal/convert/adv2v2.go

@@ -121,13 +121,10 @@ func convertRepSpecs(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) error
 }
 
 func convertRepSpecsWithDynamicBlock(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) (dynamicBlock, error) {
-	dSpec, err := getDynamicBlock(resourceb, nRepSpecs)
+	dSpec, err := getDynamicBlock(resourceb, nRepSpecs, true)
 	if err != nil || !dSpec.IsPresent() {
 		return dynamicBlock{}, err
 	}
-	if len(collectBlocks(resourceb, nRepSpecs)) > 0 {
-		return dynamicBlock{}, errDynamicBlockAlone
-	}
 	transformReferences(dSpec.content.Body(), nRepSpecs, nSpec)
 	dConfig, err := convertConfigsWithDynamicBlock(dSpec.content.Body(), diskSizeGB, true)
 	if err != nil {
@@ -141,13 +138,10 @@ func convertRepSpecsWithDynamicBlock(resourceb *hclwrite.Body, diskSizeGB hclwri
 // convertConfigsWithDynamicBlock is used for processing dynamic blocks in region_configs
 func convertConfigsWithDynamicBlock(specbSrc *hclwrite.Body, diskSizeGB hclwrite.Tokens,
 	insideDynamicRepSpec bool) (dynamicBlock, error) {
-	d, err := getDynamicBlock(specbSrc, nConfig)
+	d, err := getDynamicBlock(specbSrc, nConfig, true)
 	if err != nil || !d.IsPresent() {
 		return dynamicBlock{}, err
 	}
-	if len(collectBlocks(specbSrc, nConfig)) > 0 {
-		return dynamicBlock{}, errDynamicBlockAlone
-	}
 	configBody := d.content.Body()
 	transformReferences(configBody, getResourceName(d.block), nRegion)
 	regionConfigBody := hclwrite.NewEmptyFile().Body()

internal/convert/clu2adv.go

@@ -75,7 +75,7 @@ func convertResource(block *hclwrite.Block) (bool, error) {
 }
 
 func isFreeTierCluster(resourceb *hclwrite.Body) bool {
-	d, _ := getDynamicBlock(resourceb, nRepSpecs)
+	d, _ := getDynamicBlock(resourceb, nRepSpecs, true)
 	return resourceb.FirstMatchingBlock(nRepSpecs, nil) == nil && !d.IsPresent()
 }
 
@@ -221,13 +221,10 @@ func fillRepSpecs(resourceb *hclwrite.Body, root attrVals) error {
 
 // fillRepSpecsWithDynamicBlock used for dynamic blocks in replication_specs
 func fillRepSpecsWithDynamicBlock(resourceb *hclwrite.Body, root attrVals) (dynamicBlock, error) {
-	dSpec, err := getDynamicBlock(resourceb, nRepSpecs)
+	dSpec, err := getDynamicBlock(resourceb, nRepSpecs, true)
 	if err != nil || !dSpec.IsPresent() {
 		return dynamicBlock{}, err
 	}
-	if len(collectBlocks(resourceb, nRepSpecs)) > 0 {
-		return dynamicBlock{}, errDynamicBlockAlone
-	}
 	transformReferences(dSpec.content.Body(), nRepSpecs, nSpec)
 	dConfig, err := fillConfigsWithDynamicRegion(dSpec.content.Body(), root, true)
 	if err != nil {
@@ -242,13 +239,10 @@ func fillRepSpecsWithDynamicBlock(resourceb *hclwrite.Body, root attrVals) (dyna
 
 // fillConfigsWithDynamicRegion is used for dynamic blocks in region_configs
 func fillConfigsWithDynamicRegion(specbSrc *hclwrite.Body, root attrVals, changeReferences bool) (dynamicBlock, error) {
-	d, err := getDynamicBlock(specbSrc, nConfigSrc)
+	d, err := getDynamicBlock(specbSrc, nConfigSrc, true)
 	if err != nil || !d.IsPresent() {
 		return dynamicBlock{}, err
 	}
-	if len(collectBlocks(specbSrc, nConfigSrc)) > 0 {
-		return dynamicBlock{}, errDynamicBlockAlone
-	}
 	repSpecb := hclwrite.NewEmptyFile().Body()
 	if zoneName := hcl.GetAttrExpr(specbSrc.GetAttribute(nZoneName)); zoneName != "" {
 		repSpecb.SetAttributeRaw(nZoneName, hcl.TokensFromExpr(zoneName))

internal/convert/shared.go

@@ -56,8 +56,13 @@ func (d dynamicBlock) IsPresent() bool {
 }
 
 // getDynamicBlock finds and returns a dynamic block with the given name from the body
-func getDynamicBlock(body *hclwrite.Body, name string) (dynamicBlock, error) {
+func getDynamicBlock(body *hclwrite.Body, name string, checkAlone bool) (dynamicBlock, error) {
+	var db dynamicBlock
+	staticBlockCount := 0
 	for _, block := range body.Blocks() {
+		if block.Type() == name {
+			staticBlockCount++
+		}
 		if block.Type() != nDynamic || name != getResourceName(block) {
 			continue
 		}
@@ -70,9 +75,14 @@ func getDynamicBlock(body *hclwrite.Body, name string) (dynamicBlock, error) {
 		if content == nil {
 			return dynamicBlock{}, fmt.Errorf("dynamic block %s: block %s not found", name, nContent)
 		}
-		return dynamicBlock{forEach: forEach, block: block, content: content}, nil
+		if !db.IsPresent() {
+			db = dynamicBlock{forEach: forEach, block: block, content: content}
+		}
+	}
+	if checkAlone && db.IsPresent() && staticBlockCount > 0 {
+		return dynamicBlock{}, errDynamicBlockAlone
 	}
-	return dynamicBlock{}, nil
+	return db, nil
 }
 
 func checkDynamicBlock(body *hclwrite.Body) error {
@@ -185,7 +195,7 @@ func fillTagsLabelsOpt(resourceb *hclwrite.Body, name string) error {
 }
 
 func extractTagsLabelsDynamicBlock(resourceb *hclwrite.Body, name string) (hclwrite.Tokens, error) {
-	d, err := getDynamicBlock(resourceb, name)
+	d, err := getDynamicBlock(resourceb, name, false)
 	if err != nil || !d.IsPresent() {
 		return nil, err
 	}