simplify use of TokensFuncConcat

Author: lantoli

internal/convert/adv2v2.go

@@ -103,13 +103,7 @@ func convertRepSpecs(resourceb *hclwrite.Body, diskSizeGB hclwrite.Tokens) error
 			}
 			concatParts = append(concatParts, tokens)
 		}
-
-		// Use concat to combine all parts
-		if len(concatParts) > 1 {
-			resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensFuncConcat(concatParts...))
-		} else {
-			resourceb.SetAttributeRaw(nRepSpecs, concatParts[0])
-		}
+		resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensFuncConcat(concatParts...))
 	} else {
 		// All num_shards are numeric or missing, use simple array
 		var repSpecs []*hclwrite.Body

internal/convert/clu2adv.go

@@ -237,13 +237,7 @@ func fillReplicationSpecs(resourceb *hclwrite.Body, root attrVals) error {
 			}
 			concatParts = append(concatParts, tokens)
 		}
-
-		// Use concat to combine all parts
-		if len(concatParts) > 1 {
-			resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensFuncConcat(concatParts...))
-		} else {
-			resourceb.SetAttributeRaw(nRepSpecs, concatParts[0])
-		}
+		resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensFuncConcat(concatParts...))
 	} else {
 		// All num_shards are numeric, use simple array
 		var specbs []*hclwrite.Body

internal/hcl/hcl.go

@@ -121,6 +121,9 @@ func TokensFuncMerge(tokens ...hclwrite.Tokens) hclwrite.Tokens {
 // TokensFuncConcat creates the tokens for the HCL concat function.
 func TokensFuncConcat(tokens ...hclwrite.Tokens) hclwrite.Tokens {
 	params := EncloseNewLines(joinTokens(tokens...))
+	if len(tokens) == 1 {
+		return tokens[0] // no need to concat if there's only one element
+	}
 	ret := TokensFromExpr("concat")
 	return append(ret, EncloseParens(params)...)
 }