fix: fallback to IONOS_CONFIG_FILE if not found at --config location (#560)

* fix: fallback to IONOS_CONFIG_FILE env, and ~/.ionos/config SDK Default

* doc: changelog

* test: add test

* test: fix windows

Author: avirtopeanu-ionos

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Changed config generation product name from 'compute' to 'cloud' for CloudAPI, though existing configurations using 'compute' key will continue to work.
 
 ### Fixed
+- Fixed a bug where the fallback to IONOS_CONFIG_FILE and ~/.ionos/config was not working correctly
 - Fixed 'ionosctl mongo cluster update' sending a payload containing certain nil/empty values to the API, which would cause a 500 Internal Server Error.
 - Fixed a bug where config overrides were ignored for certain CloudAPI commands
 

commands/cfg/location.go

@@ -18,9 +18,11 @@ func LocationCmd() *core.Command {
 		PreCmdRun: core.NoPreRun,
 		CmdRun: func(c *core.CommandConfig) error {
 			cl, authErr := client.Get()
-			path := config.GetConfigFilePath()
-			if authErr == nil && cl != nil && cl.Config == nil {
+			var path string
+			if authErr == nil && cl != nil && cl.ConfigPath != "" {
 				path = cl.ConfigPath
+			} else {
+				path = config.GetConfigFilePath()
 			}
 
 			_, err := fmt.Fprintf(c.Command.Command.OutOrStdout(), path)

internal/client/client.go

@@ -4,48 +4,16 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 
-	cfg "github.com/ionos-cloud/ionosctl/v6/internal/config"
 	"github.com/ionos-cloud/ionosctl/v6/internal/constants"
 	"github.com/ionos-cloud/ionosctl/v6/pkg/die"
-	"github.com/ionos-cloud/sdk-go-bundle/shared"
-	"github.com/ionos-cloud/sdk-go-bundle/shared/fileconfiguration"
 	"github.com/spf13/viper"
-	"gopkg.in/yaml.v3"
 )
 
 var once sync.Once
 var instance *Client
 
-func retrieveConfigFile() (*fileconfiguration.FileConfig, string, error) {
-	// 1) --config flag
-	if cfg, path, err := loadFromFlag(); cfg != nil || err != nil {
-		return cfg, path, err
-	}
-
-	// 2) SDK env var
-	if cfg, path, err := loadFromEnvVar(); cfg != nil || err != nil {
-		return cfg, path, err
-	}
-
-	// 3) migrate old JSON if applicable
-	if cfg, path, err := loadFromJSONMigration(); cfg != nil || err != nil {
-		return cfg, path, err
-	}
-
-	// 4) default SDK path
-	if cfg, path, err := loadFromSDKDefault(); cfg != nil || err != nil {
-		return cfg, path, err
-	}
-
-	// note: if we reach this point, no config file was found
-	// though old CLI behaviour was to return the default config path
-	return nil, viper.GetString(constants.ArgConfig), nil
-}
-
 func Get() (*Client, error) {
 	var getClientErr error
 
@@ -54,11 +22,12 @@ func Get() (*Client, error) {
 
 	once.Do(
 		func() {
-			config, path, err := retrieveConfigFile()
+			src, err := retrieveConfigFile()
 			if err != nil {
 				getClientErr = fmt.Errorf("failed to retrieve config file: %w", err)
 				return
 			}
+			config, path := src.Config, src.Path
 
 			if instance == nil && os.Getenv(constants.EnvToken) != "" {
 				instance = newClient("", "", os.Getenv(constants.EnvToken), desiredURL)
@@ -166,71 +135,3 @@ func (c *Client) TestCreds() error {
 func EnforceClient(user, pass, token, hostUrl string) {
 	instance = newClient(user, pass, token, hostUrl)
 }
-
-func loadFromFlag() (*fileconfiguration.FileConfig, string, error) {
-	path := viper.GetString(constants.ArgConfig)
-	if path == "" {
-		return nil, "", nil
-	}
-	cfg, err := fileconfiguration.New(path)
-	if err != nil && !strings.Contains(err.Error(), "does not exist") {
-		return nil, path, fmt.Errorf("failed to load config from --config '%s': %w", path, err)
-	}
-	return cfg, path, nil
-}
-
-func loadFromEnvVar() (*fileconfiguration.FileConfig, string, error) {
-	path := os.Getenv(shared.IonosFilePathEnvVar)
-	if path == "" {
-		return nil, "", nil
-	}
-	cfg, err := fileconfiguration.New(path)
-	if err != nil && !strings.Contains(err.Error(), "does not exist") {
-		return nil, path, fmt.Errorf(
-			"failed to load config from env var %s='%s': %w",
-			shared.IonosFilePathEnvVar, path, err,
-		)
-	}
-	return cfg, path, nil
-}
-
-func loadFromJSONMigration() (*fileconfiguration.FileConfig, string, error) {
-	yamlPath := viper.GetString(constants.ArgConfig)
-	if yamlPath == "" {
-		return nil, "", nil
-	}
-
-	jsonPath := filepath.Join(filepath.Dir(yamlPath), "config.json")
-	if _, err := os.Stat(jsonPath); err != nil {
-		return nil, "", nil // no JSON to migrate
-	}
-
-	migrated, err := cfg.MigrateFromJSON(jsonPath)
-	if err != nil {
-		return nil, "", fmt.Errorf("failed migrating %s → YAML: %w", jsonPath, err)
-	}
-	if migrated == nil {
-		return nil, "", nil
-	}
-
-	out, _ := yaml.Marshal(migrated)
-	if err := os.WriteFile(yamlPath, out, 0o600); err != nil {
-		fmt.Fprintf(os.Stderr,
-			"Warning: could not write migrated config to %s: %v\n",
-			yamlPath, err,
-		)
-	}
-	return migrated, yamlPath, nil
-}
-
-func loadFromSDKDefault() (*fileconfiguration.FileConfig, string, error) {
-	defaultPath, err := fileconfiguration.DefaultConfigFileName()
-	if err != nil {
-		return nil, defaultPath, fmt.Errorf("failed to get default config path: %w", err)
-	}
-	cfg, err := fileconfiguration.New(defaultPath)
-	if err != nil && !strings.Contains(err.Error(), "does not exist") {
-		return nil, defaultPath, fmt.Errorf("failed to load default config '%s': %w", defaultPath, err)
-	}
-	return cfg, defaultPath, nil
-}

internal/client/config_integration.go

@@ -0,0 +1,121 @@
+package client
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	cfg "github.com/ionos-cloud/ionosctl/v6/internal/config"
+	"github.com/ionos-cloud/ionosctl/v6/internal/constants"
+	"github.com/ionos-cloud/sdk-go-bundle/shared"
+	"github.com/ionos-cloud/sdk-go-bundle/shared/fileconfiguration"
+	"github.com/spf13/viper"
+	"gopkg.in/yaml.v3"
+)
+
+// ConfigSource holds a loaded FileConfig (or nil) plus the path it came from.
+type ConfigSource struct {
+	Config *fileconfiguration.FileConfig
+	Path   string
+}
+
+// retrieveConfigFile returns the first successful config or a fatal error.
+// If no config is found, ConfigSource.Config will be nil and Path will be the
+// default flag value (for backwards-compat).
+func retrieveConfigFile() (ConfigSource, error) {
+	loaders := []func() (ConfigSource, error){
+		loadFromFlag,
+		loadFromEnvVar,
+		loadFromJSONMigration,
+		loadFromSDKDefault,
+	}
+
+	for _, load := range loaders {
+		src, err := load()
+		if err != nil {
+			// I/O or parse error: stop immediately
+			return ConfigSource{}, err
+		}
+		if src.Config != nil {
+			// found a valid config; return it
+			return src, nil
+		}
+		// not found -> try next
+	}
+
+	// none found -> return nil config, default flag path
+	return ConfigSource{nil, viper.GetString(constants.ArgConfig)}, nil
+}
+
+// loadFromFlag tries --config; if empty or missing -> (nil, ""), nil;
+// on I/O/parse error -> err; on success -> (*FileConfig, path), nil.
+func loadFromFlag() (ConfigSource, error) {
+	path := viper.GetString(constants.ArgConfig)
+	if path == "" {
+		return ConfigSource{}, nil
+	}
+	return tryLoad(path, "--config")
+}
+
+// loadFromEnvVar tries IONOS_CONFIG_FILE; same semantics as loadFromFlag.
+func loadFromEnvVar() (ConfigSource, error) {
+	path := os.Getenv(shared.IonosFilePathEnvVar)
+	if path == "" {
+		return ConfigSource{}, nil
+	}
+	return tryLoad(path, fmt.Sprintf("env %s", shared.IonosFilePathEnvVar))
+}
+
+// loadFromJSONMigration migrates legacy config.json (if present next to --config path).
+// On success returns the new YAML config; on any error returns err.
+func loadFromJSONMigration() (ConfigSource, error) {
+	yamlPath := viper.GetString(constants.ArgConfig)
+	if yamlPath == "" {
+		return ConfigSource{}, nil
+	}
+	jsonPath := filepath.Join(filepath.Dir(yamlPath), "config.json")
+	if _, err := os.Stat(jsonPath); err != nil {
+		return ConfigSource{}, nil
+	}
+
+	migrated, err := cfg.MigrateFromJSON(jsonPath)
+	if err != nil {
+		return ConfigSource{}, fmt.Errorf("failed migrating %q to YAML: %w", jsonPath, err)
+	}
+	if migrated == nil {
+		return ConfigSource{}, nil
+	}
+
+	out, _ := yaml.Marshal(migrated)
+	if err := os.WriteFile(yamlPath, out, 0o600); err != nil {
+		fmt.Fprintf(os.Stderr,
+			"Warning: could not write migrated config to %s: %v\n",
+			yamlPath, err)
+	}
+	return ConfigSource{migrated, yamlPath}, nil
+}
+
+// loadFromSDKDefault tries the SDK default path (~/.ionos/config).
+func loadFromSDKDefault() (ConfigSource, error) {
+	defaultPath, err := fileconfiguration.DefaultConfigFileName()
+	if err != nil {
+		return ConfigSource{}, fmt.Errorf("could not determine default config path: %w", err)
+	}
+	return tryLoad(defaultPath, "SDK default")
+}
+
+// tryLoad loads a FileConfig from the given path.
+// If the file does not exist, it returns a nil FileConfig and the path.
+// If the file exists but cannot be loaded, it returns an error.
+// If the file is loaded successfully, it returns the FileConfig and the path.
+func tryLoad(path, sourceDesc string) (ConfigSource, error) {
+	cfg, err := fileconfiguration.New(path)
+	if err != nil {
+		if strings.Contains(err.Error(), "does not exist") {
+			return ConfigSource{nil, path}, nil
+		}
+		return ConfigSource{}, fmt.Errorf("%s: failed loading %q: %w", sourceDesc, path, err)
+	}
+	return ConfigSource{cfg, path}, nil
+}