reduce empty lines

Author: lantoli

internal/convert/adv2v2.go

@@ -64,68 +64,57 @@ func convertRepSpecs(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) error
 	if dSpec.IsPresent() {
 		return convertDynamicRepSpecs(resourceb, dSpec, diskSizeGB)
 	}
-
 	repSpecBlocks := collectBlocks(resourceb, nRepSpecs)
 	if len(repSpecBlocks) == 0 {
 		return fmt.Errorf("must have at least one replication_specs")
 	}
-
+	var tokens hclwrite.Tokens
 	if hasVariableNumShards(repSpecBlocks) {
-		tokens, err := processVariableNumShards(repSpecBlocks, diskSizeGB)
-		if err != nil {
-			return err
-		}
-		resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensFuncConcat(tokens...))
+		tokens, err = processVariableNumShards(repSpecBlocks, diskSizeGB)
 	} else {
-		tokens, err := processStaticNumShards(repSpecBlocks, diskSizeGB)
-		if err != nil {
-			return err
-		}
-		resourceb.SetAttributeRaw(nRepSpecs, tokens)
+		tokens, err = processStaticNumShards(repSpecBlocks, diskSizeGB)
 	}
-
+	if err != nil {
+		return err
+	}
+	resourceb.SetAttributeRaw(nRepSpecs, tokens)
 	return nil
 }
 
 func convertDynamicRepSpecs(resourceb *hclwrite.Body, dSpec dynamicBlock, diskSizeGB hclwrite.Tokens) error {
 	transformDynamicBlockReferences(dSpec.content.Body(), nRepSpecs, nSpec)
-
 	dConfig, err := findDynamicConfigBlock(dSpec.content.Body())
 	if err != nil {
 		return err
 	}
 	if dConfig.IsPresent() {
 		return convertDynamicRepSpecsWithDynamicConfig(resourceb, dSpec, dConfig, diskSizeGB)
 	}
-
 	tokens, err := processDynamicRepSpecsWithoutConfig(dSpec, diskSizeGB)
 	if err != nil {
 		return err
 	}
-
 	resourceb.RemoveBlock(dSpec.block)
 	resourceb.SetAttributeRaw(nRepSpecs, tokens)
 	return nil
 }
 
-func processVariableNumShards(repSpecBlocks []*hclwrite.Block, diskSizeGB hclwrite.Tokens) ([]hclwrite.Tokens, error) {
+func processVariableNumShards(repSpecBlocks []*hclwrite.Block, diskSizeGB hclwrite.Tokens) (hclwrite.Tokens, error) {
 	var concatParts []hclwrite.Tokens
 	for _, block := range repSpecBlocks {
 		blockb := block.Body()
 		numShardsAttr := blockb.GetAttribute(nNumShards)
 		blockb.RemoveAttribute(nNumShards)
-
 		if err := convertConfig(blockb, diskSizeGB); err != nil {
 			return nil, err
 		}
-
 		tokens, err := processNumShards(numShardsAttr, blockb)
 		if err != nil {
 			return nil, err
 		}
 		concatParts = append(concatParts, tokens)
 	}
-	return concatParts, nil
+	return hcl.TokensFuncConcat(concatParts...), nil
 }
 
 func processStaticNumShards(repSpecBlocks []*hclwrite.Block, diskSizeGB hclwrite.Tokens) (hclwrite.Tokens, error) {
@@ -134,11 +123,9 @@ func processStaticNumShards(repSpecBlocks []*hclwrite.Block, diskSizeGB hclwrite
 		blockb := block.Body()
 		numShardsAttr := blockb.GetAttribute(nNumShards)
 		blockb.RemoveAttribute(nNumShards)
-
 		if err := convertConfig(blockb, diskSizeGB); err != nil {
 			return nil, err
 		}
-
 		if numShardsAttr != nil {
 			numShardsVal, _ := hcl.GetAttrInt(numShardsAttr, errNumShards)
 			for range numShardsVal {
@@ -168,15 +155,12 @@ func findDynamicConfigBlock(body *hclwrite.Body) (dynamicBlock, error) {
 func processDynamicRepSpecsWithoutConfig(dSpec dynamicBlock, diskSizeGB hclwrite.Tokens) (hclwrite.Tokens, error) {
 	numShardsAttr := dSpec.content.Body().GetAttribute(nNumShards)
 	dSpec.content.Body().RemoveAttribute(nNumShards)
-
 	if err := convertConfig(dSpec.content.Body(), diskSizeGB); err != nil {
 		return nil, err
 	}
-
 	if numShardsAttr != nil {
 		return buildDynamicRepSpecsWithShards(dSpec, numShardsAttr)
 	}
-
 	return buildSimpleDynamicRepSpecs(dSpec)
 }
 
@@ -202,22 +186,18 @@ func buildDynamicRepSpecsWithNumShards(dSpec, dConfig dynamicBlock, diskSizeGB h
 	configBlockName string, numShardsAttr *hclwrite.Attribute) (hclwrite.Tokens, error) {
 	numShardsExpr := replaceDynamicBlockReferences(hcl.GetAttrExpr(numShardsAttr), nRepSpecs, nSpec)
 	transformDynamicBlockReferencesRecursive(dConfig.content.Body(), configBlockName, nRegion)
-
 	transform := func(expr string) string {
 		return replaceDynamicBlockReferences(expr, nRepSpecs, nSpec)
 	}
 	transformAttributesSorted(dConfig.content.Body(), dConfig.content.Body().Attributes(), transform)
 	for _, block := range dConfig.content.Body().Blocks() {
 		transformAttributesSorted(block.Body(), block.Body().Attributes(), transform)
 	}
-
 	regionConfigBody := buildRegionConfigBody(dConfig, diskSizeGB)
 	regionTokens := buildRegionForExpr(nSpec, regionConfigBody)
-
 	repSpecBody := buildRepSpecBody(dSpec, regionTokens)
 	innerTokens := buildInnerForExpr(numShardsExpr, repSpecBody)
 	outerTokens := buildOuterForExpr(dSpec, innerTokens)
-
 	return hcl.TokensFuncFlatten(outerTokens), nil
 }
 

internal/convert/clu2adv.go

@@ -67,7 +67,6 @@ func convertResource(block *hclwrite.Block) (bool, error) {
 	if errDyn := checkDynamicBlock(blockb); errDyn != nil {
 		return false, errDyn
 	}
-
 	var err error
 	if isFreeTierCluster(blockb) {
 		err = fillFreeTierCluster(blockb)
@@ -139,7 +138,6 @@ func fillFreeTierCluster(resourceb *hclwrite.Body) error {
 		return err
 	}
 	configb.SetAttributeRaw(nElectableSpecs, hcl.TokensObject(electableSpec.Body()))
-
 	repSpecs := hclwrite.NewEmptyFile()
 	repSpecs.Body().SetAttributeRaw(nConfig, hcl.TokensArraySingle(configb))
 	resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensArraySingle(repSpecs.Body()))
@@ -181,12 +179,10 @@ func fillReplicationSpecs(resourceb *hclwrite.Body, root attrVals) error {
 		resourceb.SetAttributeRaw(nRepSpecs, d.tokens)
 		return nil
 	}
-
 	repSpecBlocks := collectBlocks(resourceb, nRepSpecs)
 	if len(repSpecBlocks) == 0 {
 		return fmt.Errorf("%s: no replication_specs found", errRepSpecs)
 	}
-
 	if hasVariableNumShards(repSpecBlocks) {
 		tokens, err := processVariableReplicationSpecs(repSpecBlocks, root)
 		if err != nil {

internal/convert/shared.go

@@ -100,13 +100,10 @@ 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)
 	}