fix linter error

cloudposse · Feb 24, 2025 · 462b5bf · 462b5bf
1 parent 0a9353a
commit 462b5bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/pkg/config/imports.go b/pkg/config/imports.go
@@ -38,7 +38,7 @@ type ResolvedPaths struct {
 	importType  importTypes
 }
 
-// processConfigImports It reads the import paths from the source configuration,
+// processConfigImports It reads the import paths from the source configuration.
 // It processes imports from the source configuration and merges them into the destination configuration.
 func processConfigImports(source *schema.AtmosConfiguration, dst *viper.Viper) error {
 	if source == nil || dst == nil {
@@ -115,12 +115,12 @@ func processImports(basePath string, importPaths []string, tempDir string, curre
 	return resolvedPaths, nil
 }
 
-// Helper to determine if the import is a supported remote source
+// Helper to determine if the import is a supported remote source.
 func isRemoteImport(importPath string) bool {
 	return strings.HasPrefix(importPath, "http://") || strings.HasPrefix(importPath, "https://")
 }
 
-// Process remote imports
+// Process remote imports.
 func processRemoteImport(basePath, importPath, tempDir string, currentDepth, maxDepth int) ([]ResolvedPaths, error) {
 	parsedURL, err := url.Parse(importPath)
 	if err != nil || (parsedURL.Scheme != "http" && parsedURL.Scheme != "https") {
@@ -166,7 +166,7 @@ func processRemoteImport(basePath, importPath, tempDir string, currentDepth, max
 	return resolvedPaths, nil
 }
 
-// Process local imports
+// Process local imports.
 func processLocalImport(basePath string, importPath, tempDir string, currentDepth, maxDepth int) ([]ResolvedPaths, error) {
 	if importPath == "" {
 		return nil, fmt.Errorf("import_path required to process imports")
@@ -248,7 +248,7 @@ func SearchAtmosConfig(path string) ([]string, error) {
 	return atmosFilePathsAbsolute, nil
 }
 
-// Helper function to generate search patterns for extension yaml,yml
+// Helper function to generate search patterns for extension yaml,yml.
 func generatePatterns(path string) []string {
 	isDir := false
 	if stat, err := os.Stat(path); err == nil && stat.IsDir() {
@@ -275,7 +275,7 @@ func generatePatterns(path string) []string {
 	return []string{path}
 }
 
-// Helper function to convert paths to absolute paths
+// Helper function to convert paths to absolute paths.
 func convertToAbsolutePaths(filePaths []string) ([]string, error) {
 	var absPaths []string
 	for _, path := range filePaths {

diff --git a/pkg/config/load.go b/pkg/config/load.go
@@ -107,7 +107,7 @@ func readSystemConfig(v *viper.Viper) error {
 	}
 
 	if len(configFilePath) > 0 {
-		err := mergeConfig(v, configFilePath, CliConfigFileName, false)
+		err := mergeConfig(v, configFilePath, false)
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
 			return nil
@@ -125,7 +125,7 @@ func readHomeConfig(v *viper.Viper) error {
 		return err
 	}
 	configFilePath := filepath.Join(home, ".atmos")
-	err = mergeConfig(v, configFilePath, CliConfigFileName, true)
+	err = mergeConfig(v, configFilePath, true)
 	if err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
@@ -144,7 +144,7 @@ func readWorkDirConfig(v *viper.Viper) error {
 	if err != nil {
 		return err
 	}
-	err = mergeConfig(v, wd, CliConfigFileName, true)
+	err = mergeConfig(v, wd, true)
 	if err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
@@ -162,7 +162,7 @@ func readEnvAmosConfigPath(v *viper.Viper) error {
 		return nil
 	}
 	configFilePath := filepath.Join(atmosPath, CliConfigFileName)
-	err := mergeConfig(v, configFilePath, CliConfigFileName, true)
+	err := mergeConfig(v, configFilePath, true)
 	if err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
@@ -181,7 +181,7 @@ func readAtmosConfigCli(v *viper.Viper, atmosCliConfigPath string) error {
 	if len(atmosCliConfigPath) == 0 {
 		return nil
 	}
-	err := mergeConfig(v, atmosCliConfigPath, CliConfigFileName, true)
+	err := mergeConfig(v, atmosCliConfigPath, true)
 	switch err.(type) {
 	case viper.ConfigFileNotFoundError:
 		log.Debug("config not found", "file", atmosCliConfigPath)
@@ -192,10 +192,10 @@ func readAtmosConfigCli(v *viper.Viper, atmosCliConfigPath string) error {
 	return nil
 }
 
-// mergeConfig merge config from a specified path and process imports.return error if config file not exist .
-func mergeConfig(v *viper.Viper, path string, fileName string, processImports bool) error {
+// mergeConfig merge config from a specified path directory and process imports.return error if config file not exist .
+func mergeConfig(v *viper.Viper, path string, processImports bool) error {
 	v.AddConfigPath(path)
-	v.SetConfigName(fileName)
+	v.SetConfigName(CliConfigFileName)
 	err := v.MergeInConfig()
 	if err != nil {
 		return err