updates

examples/quick-start-advanced/b c.txt

@@ -1 +1,2 @@
-HELLO
+- HELLO
+- WORLD

examples/quick-start-advanced/stacks/catalog/vpc/defaults.yaml

@@ -55,4 +55,5 @@ components:
         test6: !include stacks/catalog/vpc/ue2.yaml .components.terraform.vpc.vars.availability_zones
         test7: !include 'stacks/catalog/vpc/ue2.yaml .components.terraform.vpc.vars.availability_zones[2]'
         test8: !include a.txt
-        test9: !env USER
+        test9: !include '"b c.txt" ".[1]"'
+        test10: !env USER

internal/exec/yaml_func_include.go

@@ -25,7 +25,13 @@ func processTagInclude(
 	// while also ignoring leading and trailing whitespace
 	var f string
 	q := ""
-	parts := strings.Fields(str)
+
+	parts, err := u.SplitStringByDelimiter(str, ' ')
+	if err != nil {
+		e := fmt.Errorf("error evaluating the YAML function: %s\n%v", input, err)
+		u.LogErrorAndExit(atmosConfig, e)
+	}
+
 	partsLen := len(parts)
 
 	if partsLen == 2 {

pkg/describe/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../tests/fixtures/scenarios/complete"
+base_path: "../../examples/quick-start-advanced"
 
 components:
   terraform:

pkg/describe/describe_component_test.go

@@ -90,3 +90,15 @@ func TestDescribeComponent7(t *testing.T) {
 	assert.Nil(t, err)
 	t.Log(componentSectionYaml)
 }
+
+func TestDescribeComponent8(t *testing.T) {
+	component := "vpc"
+	stack := "plat-ue2-dev"
+
+	componentSection, err := ExecuteDescribeComponent(component, stack, true)
+	assert.Nil(t, err)
+
+	componentSectionYaml, err := u.ConvertToYAML(componentSection)
+	assert.Nil(t, err)
+	t.Log(componentSectionYaml)
+}

pkg/utils/string_utils.go

@@ -1,5 +1,10 @@
 package utils
 
+import (
+	"encoding/csv"
+	"strings"
+)
+
 // UniqueStrings returns a unique subset of the string slice provided
 func UniqueStrings(input []string) []string {
 	u := make([]string, 0, len(input))
@@ -14,3 +19,16 @@ func UniqueStrings(input []string) []string {
 
 	return u
 }
+
+// SplitStringByDelimiter splits a string by the delimiter, not splitting inside quotes
+func SplitStringByDelimiter(str string, delimiter rune) ([]string, error) {
+	r := csv.NewReader(strings.NewReader(str))
+	r.Comma = delimiter
+
+	parts, err := r.Read()
+	if err != nil {
+		return nil, err
+	}
+
+	return parts, nil
+}

pkg/utils/yaml_utils.go

@@ -113,9 +113,11 @@ func getValueWithTag(atmosConfig *schema.AtmosConfiguration, n *yaml.Node, file
 		var f string
 		q := ""
 
-		// Split the value into slices based on any whitespace (one or more spaces, tabs, or newlines),
-		// while also ignoring leading and trailing whitespace
-		parts := strings.Fields(val)
+		parts, err := SplitStringByDelimiter(val, ' ')
+		if err != nil {
+			return "", err
+		}
+
 		partsLen := len(parts)
 
 		if partsLen == 2 {
@@ -133,7 +135,7 @@ func getValueWithTag(atmosConfig *schema.AtmosConfiguration, n *yaml.Node, file
 			if !FileExists(f) {
 				return "", fmt.Errorf("the function '%s %s' points to a file that does not exist", tag, val)
 			}
-			return strings.TrimSpace(tag + " " + f + " " + q), nil
+			return strings.TrimSpace(tag + " \"" + f + "\" " + q), nil
 		}
 
 		// Detect relative paths (relative to the manifest file) and convert to absolute paths
@@ -142,7 +144,7 @@ func getValueWithTag(atmosConfig *schema.AtmosConfiguration, n *yaml.Node, file
 			if !FileExists(resolved) {
 				return "", fmt.Errorf("the function '%s %s' points to a file that does not exist", tag, val)
 			}
-			return strings.TrimSpace(tag + " " + resolved + " " + q), nil
+			return strings.TrimSpace(tag + " \"" + resolved + " \" " + q), nil
 		}
 
 		// Check if the `!include` function points to an Atmos stack manifest relative to the `base_path` defined in `atmos.yaml`
@@ -152,10 +154,10 @@ func getValueWithTag(atmosConfig *schema.AtmosConfiguration, n *yaml.Node, file
 			if err != nil {
 				return "", fmt.Errorf("error converting the file path to an ansolute path in the function '%s %s': %v", tag, val, err)
 			}
-			return strings.TrimSpace(tag + " " + atmosManifestAbsolutePath + " " + q), nil
+			return strings.TrimSpace(tag + " \"" + atmosManifestAbsolutePath + " \" " + q), nil
 		}
 
-		return strings.TrimSpace(tag + " " + f + " " + q), nil
+		return strings.TrimSpace(tag + " \"" + f + " \" " + q), nil
 	}
 
 	return strings.TrimSpace(tag + " " + val), nil