Merge branch 'main' into feature/dev-3131-add-pager-to-atmos-describe-config-command

Author: samtholiya

cmd/cmd_utils.go

@@ -181,13 +181,13 @@ func processCommandAliases(
 				Run: func(cmd *cobra.Command, args []string) {
 					err := cmd.ParseFlags(args)
 					if err != nil {
-						u.LogErrorAndExit(err)
+						log.Fatal(err)
 					}
 
 					commandToRun := fmt.Sprintf("%s %s %s", os.Args[0], aliasCmd, strings.Join(args, " "))
 					err = e.ExecuteShell(atmosConfig, commandToRun, commandToRun, currentDirPath, nil, false)
 					if err != nil {
-						u.LogErrorAndExit(err)
+						log.Fatal(err)
 					}
 				},
 			}
@@ -337,13 +337,13 @@ func executeCustomCommand(
 			if fl.Type == "" || fl.Type == "string" {
 				providedFlag, err := flags.GetString(fl.Name)
 				if err != nil {
-					u.LogErrorAndExit(err)
+					log.Fatal(err)
 				}
 				flagsData[fl.Name] = providedFlag
 			} else if fl.Type == "bool" {
 				boolFlag, err := flags.GetBool(fl.Name)
 				if err != nil {
-					u.LogErrorAndExit(err)
+					log.Fatal(err)
 				}
 				flagsData[fl.Name] = boolFlag
 			}
@@ -362,7 +362,7 @@ func executeCustomCommand(
 			// Process Go templates in the command's 'component_config.component'
 			component, err := e.ProcessTmpl(fmt.Sprintf("component-config-component-%d", i), commandConfig.ComponentConfig.Component, data, false)
 			if err != nil {
-				u.LogErrorAndExit(err)
+				log.Fatal(err)
 			}
 			if component == "" || component == "<no value>" {
 				u.LogErrorAndExit(fmt.Errorf("the command defines an invalid 'component_config.component: %s' in '%s'",
@@ -372,7 +372,7 @@ func executeCustomCommand(
 			// Process Go templates in the command's 'component_config.stack'
 			stack, err := e.ProcessTmpl(fmt.Sprintf("component-config-stack-%d", i), commandConfig.ComponentConfig.Stack, data, false)
 			if err != nil {
-				u.LogErrorAndExit(err)
+				log.Fatal(err)
 			}
 			if stack == "" || stack == "<no value>" {
 				u.LogErrorAndExit(fmt.Errorf("the command defines an invalid 'component_config.stack: %s' in '%s'",
@@ -382,7 +382,7 @@ func executeCustomCommand(
 			// Get the config for the component in the stack
 			componentConfig, err := e.ExecuteDescribeComponent(component, stack, true, true, nil)
 			if err != nil {
-				u.LogErrorAndExit(err)
+				log.Fatal(err)
 			}
 			data["ComponentConfig"] = componentConfig
 		}
@@ -399,29 +399,29 @@ func executeCustomCommand(
 				err = fmt.Errorf("either 'value' or 'valueCommand' can be specified for the ENV var, but not both.\n"+
 					"Custom command '%s %s' defines 'value=%s' and 'valueCommand=%s' for the ENV var '%s'",
 					parentCommand.Name(), commandConfig.Name, value, valCommand, key)
-				u.LogErrorAndExit(err)
+				log.Fatal(err)
 			}
 
 			// If the command to get the value for the ENV var is provided, execute it
 			if valCommand != "" {
 				valCommandName := fmt.Sprintf("env-var-%s-valcommand", key)
-				res, err := e.ExecuteShellAndReturnOutput(atmosConfig, valCommand, valCommandName, currentDirPath, nil, false)
+				res, err := u.ExecuteShellAndReturnOutput(valCommand, valCommandName, currentDirPath, nil, false)
 				if err != nil {
-					u.LogErrorAndExit(err)
+					log.Fatal(err)
 				}
 				value = strings.TrimRight(res, "\r\n")
 			} else {
 				// Process Go templates in the values of the command's ENV vars
 				value, err = e.ProcessTmpl(fmt.Sprintf("env-var-%d", i), value, data, false)
 				if err != nil {
-					u.LogErrorAndExit(err)
+					log.Fatal(err)
 				}
 			}
 
 			envVarsList = append(envVarsList, fmt.Sprintf("%s=%s", key, value))
 			err = os.Setenv(key, value)
 			if err != nil {
-				u.LogErrorAndExit(err)
+				log.Fatal(err)
 			}
 		}
 
@@ -436,14 +436,14 @@ func executeCustomCommand(
 		// Steps support Go templates and have access to {{ .ComponentConfig.xxx.yyy.zzz }} Go template variables
 		commandToRun, err := e.ProcessTmpl(fmt.Sprintf("step-%d", i), step, data, false)
 		if err != nil {
-			u.LogErrorAndExit(err)
+			log.Fatal(err)
 		}
 
 		// Execute the command step
 		commandName := fmt.Sprintf("%s-step-%d", commandConfig.Name, i)
 		err = e.ExecuteShell(atmosConfig, commandToRun, commandName, currentDirPath, envVarsList, false)
 		if err != nil {
-			u.LogErrorAndExit(err)
+			log.Fatal(err)
 		}
 	}
 }
@@ -505,7 +505,7 @@ func checkAtmosConfig(opts ...AtmosValidateOption) {
 
 	atmosConfig, err := cfg.InitCliConfig(schema.ConfigAndStacksInfo{}, false)
 	if err != nil {
-		u.LogErrorAndExit(err)
+		log.Fatal(err)
 	}
 
 	if vCfg.CheckStack {
@@ -525,7 +525,7 @@ func printMessageForMissingAtmosConfig(atmosConfig schema.AtmosConfiguration) {
 	fmt.Println()
 	err := tuiUtils.PrintStyledText("ATMOS")
 	if err != nil {
-		u.LogErrorAndExit(err)
+		log.Fatal(err)
 	}
 
 	// Check if we're in a git repo. Warn if not.
@@ -668,7 +668,7 @@ func getConfigAndStacksInfo(commandName string, cmd *cobra.Command, args []strin
 
 	info, err := e.ProcessCommandLineArgs(commandName, cmd, finalArgs, argsAfterDoubleDash)
 	if err != nil {
-		u.LogErrorAndExit(err)
+		log.Fatal(err)
 	}
 	return info
 }

examples/quick-start-advanced/Dockerfile

@@ -6,7 +6,7 @@ ARG GEODESIC_OS=debian
 # https://atmos.tools/
 # https://github.com/cloudposse/atmos
 # https://github.com/cloudposse/atmos/releases
-ARG ATMOS_VERSION=1.172.0
+ARG ATMOS_VERSION=1.173.0
 
 # Terraform: https://github.com/hashicorp/terraform/releases
 ARG TF_VERSION=1.5.7

internal/exec/describe_component.go

@@ -10,7 +10,7 @@ import (
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
-// ExecuteDescribeComponentCmd executes `describe component` command
+// ExecuteDescribeComponentCmd executes `describe component` command.
 func ExecuteDescribeComponentCmd(cmd *cobra.Command, args []string) error {
 	if len(args) != 1 {
 		return errors.New("invalid arguments. The command requires one argument `component`")
@@ -106,26 +106,30 @@ func ExecuteDescribeComponent(
 	var configAndStacksInfo schema.ConfigAndStacksInfo
 	configAndStacksInfo.ComponentFromArg = component
 	configAndStacksInfo.Stack = stack
+	configAndStacksInfo.ComponentSection = make(map[string]any)
 
 	atmosConfig, err := cfg.InitCliConfig(configAndStacksInfo, true)
 	if err != nil {
 		return nil, err
 	}
 
-	configAndStacksInfo.ComponentType = "terraform"
+	configAndStacksInfo.ComponentType = cfg.TerraformComponentType
 	configAndStacksInfo, err = ProcessStacks(atmosConfig, configAndStacksInfo, true, processTemplates, processYamlFunctions, skip)
+	configAndStacksInfo.ComponentSection[cfg.ComponentTypeSectionName] = cfg.TerraformComponentType
 	if err != nil {
-		configAndStacksInfo.ComponentType = "helmfile"
+		configAndStacksInfo.ComponentType = cfg.HelmfileComponentType
 		configAndStacksInfo, err = ProcessStacks(atmosConfig, configAndStacksInfo, true, processTemplates, processYamlFunctions, skip)
+		configAndStacksInfo.ComponentSection[cfg.ComponentTypeSectionName] = cfg.HelmfileComponentType
 		if err != nil {
+			configAndStacksInfo.ComponentSection[cfg.ComponentTypeSectionName] = ""
 			return nil, err
 		}
 	}
 
 	return configAndStacksInfo.ComponentSection, nil
 }
 
-// FilterAbstractComponents This function removes abstract components and returns the list of components
+// FilterAbstractComponents This function removes abstract components and returns the list of components.
 func FilterAbstractComponents(componentsMap map[string]any) []string {
 	if componentsMap == nil {
 		return []string{}