Improve atmos list stacks

atmos.yaml

@@ -394,4 +394,3 @@ version:
     enabled: true
     timeout: 1000 # ms
     frequency: 1h
-

cmd/cmd_utils.go

@@ -704,12 +704,36 @@
 	u.PrintInvalidUsageErrorAndExit(errors.New(details), suggestion)
 }
 
+// filterStackNames filters out file paths and returns valid stack names
+func filterStackNames(stacksMap map[string]any, basePath string) []string {
+	stackNames := make([]string, 0)
+	for stackName := range stacksMap {
+		// Skip if it's a file path (starts with base path)
+		if basePath != "" && strings.HasPrefix(stackName, basePath+"/") {
+			continue
+		}
+		stackNames = append(stackNames, stackName)
+	}
+	return stackNames
+}
+
 func stackFlagCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	output, err := listStacks(cmd)
+	configAndStacksInfo := schema.ConfigAndStacksInfo{}
+	atmosConfig, err := cfg.InitCliConfig(configAndStacksInfo, true)
+	if err != nil {
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+
+	// Get all stacks
+	stacksMap, err := e.ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, true, true, false, nil)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
-	return output, cobra.ShellCompDirectiveNoFileComp
+
+	// Filter stack names using configured base path
+	stackNames := filterStackNames(stacksMap, atmosConfig.Stacks.BasePath)
+
+	return stackNames, cobra.ShellCompDirectiveNoFileComp
 }
 
 func AddStackCompletion(cmd *cobra.Command) {

cmd/cmd_utils_test.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFilterStackNames(t *testing.T) {
+	tests := []struct {
+		name           string
+		stacksBasePath string
+		stacksMap      map[string]any
+		expectedStacks []string
+	}{
+		{
+			name:           "filters out paths with configured base path",
+			stacksBasePath: "stacks",
+			stacksMap: map[string]any{
+				"stacks/test1.yaml": nil,
+				"test1":             nil,
+				"test2":             nil,
+				"stacks/test2":      nil,
+			},
+			expectedStacks: []string{"test1", "test2"},
+		},
+		{
+			name:           "handles custom base path",
+			stacksBasePath: "custom/path",
+			stacksMap: map[string]any{
+				"custom/path/test1.yaml": nil,
+				"test1":                  nil,
+				"test2":                  nil,
+				"custom/path/test2":      nil,
+			},
+			expectedStacks: []string{"test1", "test2"},
+		},
+		{
+			name:           "handles empty base path",
+			stacksBasePath: "",
+			stacksMap: map[string]any{
+				"test1.yaml": nil,
+				"test1":      nil,
+				"test2":      nil,
+			},
+			expectedStacks: []string{"test1", "test2", "test1.yaml"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Run the filter function
+			stacks := filterStackNames(tt.stacksMap, tt.stacksBasePath)
+
+			// Verify the results
+			assert.ElementsMatch(t, tt.expectedStacks, stacks)
+		})
+	}
+}

cmd/list_stacks.go

@@ -20,7 +20,10 @@ var listStacksCmd = &cobra.Command{
 	Short: "List all Atmos stacks or stacks for a specific component",
 	Long:  "This command lists all Atmos stacks, or filters the list to show only the stacks associated with a specified component.",
 	Example: "atmos list stacks\n" +
-		"atmos list stacks -c <component>",
+		"atmos list stacks -c <component>\n" +
+		"atmos list stacks --format json\n" +
+		"atmos list stacks --format csv --delimiter ','\n" +
+		"atmos list stacks --format table",
 	FParseErrWhitelist: struct{ UnknownFlags bool }{UnknownFlags: false},
 	Args:               cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
@@ -37,22 +40,28 @@ var listStacksCmd = &cobra.Command{
 
 func init() {
 	listStacksCmd.DisableFlagParsing = false
-	listStacksCmd.PersistentFlags().StringP("component", "c", "", "atmos list stacks -c <component>")
+	listStacksCmd.PersistentFlags().StringP("component", "c", "", "Filter stacks by component")
+	listStacksCmd.PersistentFlags().StringP("format", "f", "", "Output format (table, json, csv)")
+	listStacksCmd.PersistentFlags().StringP("delimiter", "d", "\t", "Delimiter for table and csv formats")
 	listCmd.AddCommand(listStacksCmd)
 }
 
 func listStacks(cmd *cobra.Command) ([]string, error) {
 	componentFlag, _ := cmd.Flags().GetString("component")
+	formatFlag, _ := cmd.Flags().GetString("format")
+	delimiterFlag, _ := cmd.Flags().GetString("delimiter")
+
 	configAndStacksInfo := schema.ConfigAndStacksInfo{}
 	atmosConfig, err := config.InitCliConfig(configAndStacksInfo, true)
 	if err != nil {
 		return nil, fmt.Errorf("Error initializing CLI config: %v", err)
 	}
-	stacksMap, err := e.ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, false, false, false, nil)
+
+	stacksMap, err := e.ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, true, true, false, nil)
 	if err != nil {
 		return nil, fmt.Errorf("Error describing stacks: %v", err)
 	}
 
-	output, err := l.FilterAndListStacks(stacksMap, componentFlag)
-	return output, err
+	output, err := l.FilterAndListStacks(stacksMap, componentFlag, atmosConfig.Stacks.List, formatFlag, delimiterFlag)
+	return []string{output}, err
 }

examples/quick-start-advanced/atmos.yaml

@@ -66,6 +66,16 @@ stacks:
     - "**/_defaults.yaml"
   # Can also be set using 'ATMOS_STACKS_NAME_PATTERN' ENV var
   name_pattern: "{tenant}-{environment}-{stage}"
+  list:
+    columns:
+      - name: Stack
+        value: '{{ .atmos_stack }}'
+      - name: Tenant
+        value: '{{ index .vars "tenant" }}'
+      - name: Environment
+        value: '{{ index .vars "environment" }}'
+      - name: File
+        value: '{{ .atmos_stack_file }}'
 
 workflows:
   # Can also be set using 'ATMOS_WORKFLOWS_BASE_PATH' ENV var, or '--workflows-dir' command-line argument

internal/exec/describe_stacks.go

@@ -214,6 +214,7 @@
 		if !u.MapKeyExists(finalStacksMap, stackName) {
 			finalStacksMap[stackName] = make(map[string]any)
 			finalStacksMap[stackName].(map[string]any)["components"] = make(map[string]any)
+			finalStacksMap[stackName].(map[string]any)["atmos_stack_file"] = stackFileName
 		}
 
 		if componentsSection, ok := stackSection.(map[string]any)["components"].(map[string]any); ok {
@@ -307,15 +308,22 @@
 							if err != nil {
 								return nil, err
 							}
-						} else {
+						} else if atmosConfig.Stacks.NamePattern != "" {
 							context = cfg.GetContextFromVars(varsSection)
 							configAndStacksInfo.Context = context
 							stackName, err = cfg.GetContextPrefix(stackFileName, context, GetStackNamePattern(atmosConfig), stackFileName)
 							if err != nil {
 								return nil, err
 							}
+						} else {
+							// If no name pattern or template is configured, use the stack file name
+							stackName = stackFileName
 						}
 
+						// Update the component section with the final stack name
+						configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
+						configAndStacksInfo.ComponentSection["stack"] = stackName
+
 						if filterByStack != "" && filterByStack != stackFileName && filterByStack != stackName {
 							continue
 						}
@@ -327,18 +335,15 @@
 						// Only create the stack entry if it doesn't exist
 						if !u.MapKeyExists(finalStacksMap, stackName) {
 							finalStacksMap[stackName] = make(map[string]any)
+							finalStacksMap[stackName].(map[string]any)["components"] = make(map[string]any)
+							finalStacksMap[stackName].(map[string]any)["atmos_stack_file"] = stackFileName
 						}
 
 						configAndStacksInfo.ComponentSection["atmos_component"] = componentName
-						configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
-						configAndStacksInfo.ComponentSection["stack"] = stackName
 						configAndStacksInfo.ComponentSection["atmos_stack_file"] = stackFileName
 						configAndStacksInfo.ComponentSection["atmos_manifest"] = stackFileName
 
 						if len(components) == 0 || u.SliceContainsString(components, componentName) || u.SliceContainsString(derivedComponents, componentName) {
-							if !u.MapKeyExists(finalStacksMap[stackName].(map[string]any), "components") {
-								finalStacksMap[stackName].(map[string]any)["components"] = make(map[string]any)
-							}
 							if !u.MapKeyExists(finalStacksMap[stackName].(map[string]any)["components"].(map[string]any), "terraform") {
 								finalStacksMap[stackName].(map[string]any)["components"].(map[string]any)["terraform"] = make(map[string]any)
 							}
@@ -516,15 +521,22 @@
 							if err != nil {
 								return nil, err
 							}
-						} else {
+						} else if atmosConfig.Stacks.NamePattern != "" {
 							context = cfg.GetContextFromVars(varsSection)
 							configAndStacksInfo.Context = context
 							stackName, err = cfg.GetContextPrefix(stackFileName, context, GetStackNamePattern(atmosConfig), stackFileName)
 							if err != nil {
 								return nil, err
 							}
+						} else {
+							// If no name pattern or template is configured, use the stack file name
+							stackName = stackFileName
 						}
 
+						// Update the component section with the final stack name
+						configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
+						configAndStacksInfo.ComponentSection["stack"] = stackName
+
 						if filterByStack != "" && filterByStack != stackFileName && filterByStack != stackName {
 							continue
 						}
@@ -536,18 +548,15 @@
 						// Only create the stack entry if it doesn't exist
 						if !u.MapKeyExists(finalStacksMap, stackName) {
 							finalStacksMap[stackName] = make(map[string]any)
+							finalStacksMap[stackName].(map[string]any)["components"] = make(map[string]any)
+							finalStacksMap[stackName].(map[string]any)["atmos_stack_file"] = stackFileName
 						}
 
 						configAndStacksInfo.ComponentSection["atmos_component"] = componentName
-						configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
-						configAndStacksInfo.ComponentSection["stack"] = stackName
 						configAndStacksInfo.ComponentSection["atmos_stack_file"] = stackFileName
 						configAndStacksInfo.ComponentSection["atmos_manifest"] = stackFileName
 
 						if len(components) == 0 || u.SliceContainsString(components, componentName) || u.SliceContainsString(derivedComponents, componentName) {
-							if !u.MapKeyExists(finalStacksMap[stackName].(map[string]any), "components") {
-								finalStacksMap[stackName].(map[string]any)["components"] = make(map[string]any)
-							}
 							if !u.MapKeyExists(finalStacksMap[stackName].(map[string]any)["components"].(map[string]any), "helmfile") {
 								finalStacksMap[stackName].(map[string]any)["components"].(map[string]any)["helmfile"] = make(map[string]any)
 							}