fix linter errors config.go

pkg/config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
+	log "github.com/charmbracelet/log"
 	"github.com/pkg/errors"
 
 	"github.com/cloudposse/atmos/pkg/schema"
@@ -15,97 +16,112 @@ import (
 // https://dev.to/techschoolguru/load-config-from-file-environment-variables-in-golang-with-viper-2j2d
 // https://medium.com/@bnprashanth256/reading-configuration-files-and-environment-variables-in-go-golang-c2607f912b63
 func InitCliConfig(configAndStacksInfo schema.ConfigAndStacksInfo, processStacks bool) (schema.AtmosConfiguration, error) {
-	atmosConfig, err := LoadConfig(&configAndStacksInfo)
+	atmosConfig, err := processAtmosConfigs(&configAndStacksInfo)
 	if err != nil {
 		return atmosConfig, err
 	}
-	// Process ENV vars
-	err = processEnvVars(&atmosConfig)
+	// Process the base path specified in the Terraform provider (which calls into the atmos code)
+	// This overrides all other atmos base path configs (`atmos.yaml`, ENV var `ATMOS_BASE_PATH`)
+	if configAndStacksInfo.AtmosBasePath != "" {
+		atmosConfig.BasePath = configAndStacksInfo.AtmosBasePath
+	}
+
+	// After unmarshalling, ensure AppendUserAgent is set if still empty
+	if atmosConfig.Components.Terraform.AppendUserAgent == "" {
+		atmosConfig.Components.Terraform.AppendUserAgent = fmt.Sprintf("Atmos/%s (Cloud Posse; +https://atmos.tools)", version.Version)
+	}
+
+	// Check config
+	err = checkConfig(atmosConfig, processStacks)
 	if err != nil {
 		return atmosConfig, err
 	}
 
-	// Process command-line args
-	err = processCommandLineArgs(&atmosConfig, configAndStacksInfo)
+	err = atmosConfigAbsolutePaths(&atmosConfig)
 	if err != nil {
 		return atmosConfig, err
 	}
 
-	// Process stores config
-	err = processStoreConfig(&atmosConfig)
+	if processStacks {
+		err = processStackConfigs(&atmosConfig, &configAndStacksInfo, atmosConfig.IncludeStackAbsolutePaths, atmosConfig.ExcludeStackAbsolutePaths)
+		if err != nil {
+			return atmosConfig, err
+		}
+	}
+
+	atmosConfig.Initialized = true
+	return atmosConfig, nil
+}
+
+func processAtmosConfigs(configAndStacksInfo *schema.ConfigAndStacksInfo) (schema.AtmosConfiguration, error) {
+	atmosConfig, err := LoadConfig(configAndStacksInfo)
 	if err != nil {
 		return atmosConfig, err
 	}
-
-	// Process the base path specified in the Terraform provider (which calls into the atmos code)
-	// This overrides all other atmos base path configs (`atmos.yaml`, ENV var `ATMOS_BASE_PATH`)
-	if configAndStacksInfo.AtmosBasePath != "" {
-		atmosConfig.BasePath = configAndStacksInfo.AtmosBasePath
+	// Process ENV vars
+	err = processEnvVars(&atmosConfig)
+	if err != nil {
+		return atmosConfig, err
 	}
 
-	// After unmarshalling, ensure AppendUserAgent is set if still empty
-	if atmosConfig.Components.Terraform.AppendUserAgent == "" {
-		atmosConfig.Components.Terraform.AppendUserAgent = fmt.Sprintf("Atmos/%s (Cloud Posse; +https://atmos.tools)", version.Version)
+	// Process command-line args
+	err = processCommandLineArgs(&atmosConfig, *configAndStacksInfo)
+	if err != nil {
+		return atmosConfig, err
 	}
 
-	// Check config
-	err = checkConfig(atmosConfig, processStacks)
+	// Process stores config
+	err = processStoreConfig(&atmosConfig)
 	if err != nil {
 		return atmosConfig, err
 	}
+	return atmosConfig, nil
+}
 
+// atmosConfigAbsolutePaths Convert paths to absolute path.
+func atmosConfigAbsolutePaths(atmosConfig *schema.AtmosConfiguration) error {
 	// Convert stacks base path to absolute path
 	stacksBasePath := filepath.Join(atmosConfig.BasePath, atmosConfig.Stacks.BasePath)
 	stacksBaseAbsPath, err := filepath.Abs(stacksBasePath)
 	if err != nil {
-		return atmosConfig, err
+		return err
 	}
 	atmosConfig.StacksBaseAbsolutePath = stacksBaseAbsPath
 
 	// Convert the included stack paths to absolute paths
 	includeStackAbsPaths, err := u.JoinAbsolutePathWithPaths(stacksBaseAbsPath, atmosConfig.Stacks.IncludedPaths)
 	if err != nil {
-		return atmosConfig, err
+		return err
 	}
 	atmosConfig.IncludeStackAbsolutePaths = includeStackAbsPaths
 
 	// Convert the excluded stack paths to absolute paths
 	excludeStackAbsPaths, err := u.JoinAbsolutePathWithPaths(stacksBaseAbsPath, atmosConfig.Stacks.ExcludedPaths)
 	if err != nil {
-		return atmosConfig, err
+		return err
 	}
 	atmosConfig.ExcludeStackAbsolutePaths = excludeStackAbsPaths
 
 	// Convert terraform dir to absolute path
 	terraformBasePath := filepath.Join(atmosConfig.BasePath, atmosConfig.Components.Terraform.BasePath)
 	terraformDirAbsPath, err := filepath.Abs(terraformBasePath)
 	if err != nil {
-		return atmosConfig, err
+		return err
 	}
 	atmosConfig.TerraformDirAbsolutePath = terraformDirAbsPath
 
 	// Convert helmfile dir to absolute path
 	helmfileBasePath := filepath.Join(atmosConfig.BasePath, atmosConfig.Components.Helmfile.BasePath)
 	helmfileDirAbsPath, err := filepath.Abs(helmfileBasePath)
 	if err != nil {
-		return atmosConfig, err
+		return err
 	}
 	atmosConfig.HelmfileDirAbsolutePath = helmfileDirAbsPath
 
-	if processStacks {
-		if processStacks {
-			err = processStackConfigs(&atmosConfig, configAndStacksInfo, includeStackAbsPaths, excludeStackAbsPaths)
-			if err != nil {
-				return atmosConfig, err
-			}
-		}
-	}
-
-	atmosConfig.Initialized = true
-	return atmosConfig, nil
+	return nil
 }
 
-func processStackConfigs(atmosConfig *schema.AtmosConfiguration, configAndStacksInfo schema.ConfigAndStacksInfo, includeStackAbsPaths, excludeStackAbsPaths []string) error {
+func processStackConfigs(atmosConfig *schema.AtmosConfiguration, configAndStacksInfo *schema.ConfigAndStacksInfo, includeStackAbsPaths, excludeStackAbsPaths []string) error {
 	// If the specified stack name is a logical name, find all stack manifests in the provided paths
 	stackConfigFilesAbsolutePaths, stackConfigFilesRelativePaths, stackIsPhysicalPath, err := FindAllStackConfigsInPathsForStack(
 		*atmosConfig,
@@ -132,10 +148,9 @@ func processStackConfigs(atmosConfig *schema.AtmosConfiguration, configAndStacks
 	atmosConfig.StackConfigFilesRelativePaths = stackConfigFilesRelativePaths
 
 	if stackIsPhysicalPath {
-		u.LogTrace(fmt.Sprintf("\nThe stack '%s' matches the stack manifest %s\n",
+		log.Debug(fmt.Sprintf("\nThe stack '%s' matches the stack manifest %s\n",
 			configAndStacksInfo.Stack,
-			stackConfigFilesRelativePaths[0]),
-		)
+			stackConfigFilesRelativePaths[0]))
 		atmosConfig.StackType = "Directory"
 	} else {
 		// The stack is a logical name