Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-alias-usage.golden

@@ -1,12 +1,12 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
 This namespace allows you to manage your aliases
-Aliases are stored in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are store in cli config file, Default path for this configuration file is based on the following priority order:
 
 - $SCW_CLI_CONFIG_PATH
-- $XDG_CONFIG_HOME/scw/config.yaml
-- $HOME/.config/scw/config.yaml
-- $USERPROFILE/.config/scw/config.yaml
+- $XDG_CONFIG_HOME/scw/cli.yaml
+- $HOME/.config/scw/cli.yaml
+- $USERPROFILE/.config/scw/cli.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion

core/bootstrap.go

@@ -209,7 +209,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result any, err error) {
 	ctx = InjectMeta(ctx, meta)
 
 	// Load CLI config
-	cliCfg, err := cliConfig.LoadConfig(ExtractConfigPath(ctx))
+	cliCfg, err := cliConfig.LoadConfig(ExtractCliConfigPath(ctx))
 	if err != nil {
 		printErr := printer.Print(err, nil)
 		if printErr != nil {

core/context.go

@@ -176,9 +176,19 @@ func ExtractHTTPClient(ctx context.Context) *http.Client {
 func ExtractConfigPath(ctx context.Context) string {
 	meta := extractMeta(ctx)
 	if meta.ConfigPathFlag != "" {
-		return meta.ConfigPathFlag
+		return extractMeta(ctx).ConfigPathFlag
 	}
 	// This is only useful for test when we override home environment variable
+	if home := meta.OverrideEnv["HOME"]; home != "" {
+		return path.Join(home, ".config", "scw", "config.yaml")
+	}
+
+	return scw.GetConfigPath()
+}
+
+func ExtractCliConfigPath(ctx context.Context) string {
+	meta := extractMeta(ctx)
+	// This is only useful for test when we override home environment variable
 	if home := meta.OverrideEnv["HOME"]; home != "" {
 		return path.Join(home, ".config", "scw", cliConfig.DefaultConfigFileName)
 	}

docs/commands/alias.md

@@ -1,12 +1,12 @@
 <!-- DO NOT EDIT: this file is automatically generated using scw-doc-gen -->
 # Documentation for `scw alias`
 This namespace allows you to manage your aliases
-Aliases are stored in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are store in cli config file, Default path for this configuration file is based on the following priority order:
 
 - $SCW_CLI_CONFIG_PATH
-- $XDG_CONFIG_HOME/scw/config.yaml
-- $HOME/.config/scw/config.yaml
-- $USERPROFILE/.config/scw/config.yaml
+- $XDG_CONFIG_HOME/scw/cli.yaml
+- $HOME/.config/scw/cli.yaml
+- $USERPROFILE/.config/scw/cli.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion

internal/config/config.go

@@ -16,7 +16,7 @@ import (
 const (
 	ScwConfigPathEnv = "SCW_CLI_CONFIG_PATH"
 
-	DefaultConfigFileName   = "config.yaml"
+	DefaultConfigFileName   = "cli.yaml"
 	defaultConfigPermission = 0o644
 
 	DefaultOutput      = "human"

internal/namespaces/alias/alias.go

@@ -25,12 +25,12 @@ func aliasRootCommand() *core.Command {
 		Groups: []string{"config"},
 		Short:  "Alias related commands",
 		Long: `This namespace allows you to manage your aliases
-Aliases are stored in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are store in cli config file, Default path for this configuration file is based on the following priority order:
 
 - $SCW_CLI_CONFIG_PATH
-- $XDG_CONFIG_HOME/scw/config.yaml
-- $HOME/.config/scw/config.yaml
-- $USERPROFILE/.config/scw/config.yaml
+- $XDG_CONFIG_HOME/scw/cli.yaml
+- $HOME/.config/scw/cli.yaml
+- $USERPROFILE/.config/scw/cli.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion

internal/namespaces/config/commands.go

@@ -290,12 +290,7 @@ The only allowed attributes are access_key, secret_key, default_organization_id,
 			configPath := core.ExtractConfigPath(ctx)
 			config, err := scw.LoadConfigFromPath(configPath)
 			if err != nil {
-				if strings.Contains(err.Error(), "no such file or directory") {
-					fmt.Fprintln(os.Stdout, "config file not found, will attempt to create it")
-					config = &scw.Config{}
-				} else {
-					return nil, err
-				}
+				return nil, err
 			}
 
 			// send_telemetry is the only key that is not in a profile but in the config object directly
@@ -321,6 +316,7 @@ The only allowed attributes are access_key, secret_key, default_organization_id,
 					profileValue.Field(i).Set(field)
 				}
 			}
+
 			// Save
 			err = config.SaveTo(configPath)
 			if err != nil {