Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit d4069f2917d9 · 2025-04-22T20:11:14.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-alias-usage.golden b/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 store in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are stored 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/cli.yaml
-- $HOME/.config/scw/cli.yaml
-- $USERPROFILE/.config/scw/cli.yaml
+- $XDG_CONFIG_HOME/scw/config.yaml
+- $HOME/.config/scw/config.yaml
+- $USERPROFILE/.config/scw/config.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion
diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden
@@ -13,7 +13,6 @@ AVAILABLE COMMANDS:
   list                    List Clusters
   list-available-types    List available cluster types for a cluster
   list-available-versions List available versions for a Cluster
-  migrate-to-sbs-csi      Migrate a cluster to SBS CSI
   reset-admin-token       Reset the admin token of a Cluster
   set-type                Change the Cluster type
   update                  Update a Cluster
diff --git a/cmd/scw/testdata/test-all-usage-secret-secret-create-usage.golden b/cmd/scw/testdata/test-all-usage-secret-secret-create-usage.golden
@@ -19,8 +19,8 @@ ARGS:
   [ephemeral-policy.time-to-live]            Time frame, from one second and up to one year, during which the secret's versions are valid.
   [ephemeral-policy.expires-once-accessed]   Returns `true` if the version expires after a single user access.
   [ephemeral-policy.action]                  Action to perform when the version of a secret expires (unknown_action | delete | disable)
-  [protected]                                Returns `true` if secret protection is enabled on a given secret
-  [key-id]                                   The Scaleway's Key Manager key ID
+  [protected]                                Returns `true` if secret protection is applied to a given secret
+  [key-id]                                   ID of the Scaleway Key Manager key
   [region=fr-par]                            Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
diff --git a/core/bootstrap.go b/core/bootstrap.go
@@ -209,7 +209,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 	ctx = InjectMeta(ctx, meta)
 
 	// Load CLI config
-	cliCfg, err := cliConfig.LoadConfig(ExtractCliConfigPath(ctx))
+	cliCfg, err := cliConfig.LoadConfig(ExtractConfigPath(ctx))
 	if err != nil {
 		printErr := printer.Print(err, nil)
 		if printErr != nil {
diff --git a/core/context.go b/core/context.go
@@ -176,19 +176,9 @@ func ExtractHTTPClient(ctx context.Context) *http.Client {
 func ExtractConfigPath(ctx context.Context) string {
 	meta := extractMeta(ctx)
 	if meta.ConfigPathFlag != "" {
-		return extractMeta(ctx).ConfigPathFlag
+		return meta.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)
 	}
diff --git a/docs/commands/alias.md b/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 store in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are stored 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/cli.yaml
-- $HOME/.config/scw/cli.yaml
-- $USERPROFILE/.config/scw/cli.yaml
+- $XDG_CONFIG_HOME/scw/config.yaml
+- $HOME/.config/scw/config.yaml
+- $USERPROFILE/.config/scw/config.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion
diff --git a/docs/commands/k8s.md b/docs/commands/k8s.md
@@ -14,7 +14,6 @@ This API allows you to manage Kubernetes Kapsule and Kosmos clusters.
   - [List Clusters](#list-clusters)
   - [List available cluster types for a cluster](#list-available-cluster-types-for-a-cluster)
   - [List available versions for a Cluster](#list-available-versions-for-a-cluster)
-  - [Migrate a cluster to SBS CSI](#migrate-a-cluster-to-sbs-csi)
   - [Reset the admin token of a Cluster](#reset-the-admin-token-of-a-cluster)
   - [Change the Cluster type](#change-the-cluster-type)
   - [Update a Cluster](#update-a-cluster)
@@ -399,37 +398,6 @@ scw k8s cluster list-available-versions 11111111-1111-1111-1111-111111111111
 
 
 
-### Migrate a cluster to SBS CSI
-
-Enable the latest CSI compatible with Scaleway Block Storage (SBS) and migrate all existing PersistentVolumes/VolumeSnapshotContents to SBS.
-Make sure to have the necessary Quota before running this command.
-
-**Usage:**
-
-```
-scw k8s cluster migrate-to-sbs-csi <cluster-id ...> [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| cluster-id | Required | Cluster ID for which the latest CSI compatible with Scaleway Block Storage will be enabled |
-| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
-
-
-**Examples:**
-
-
-Migrate a cluster to SBS CSI
-```
-scw k8s cluster migrate-to-sbs-csi 11111111-1111-1111-1111-111111111111
-```
-
-
-
-
 ### Reset the admin token of a Cluster
 
 Reset the admin token for a specific Kubernetes cluster. This will revoke the old admin token (which will not be usable afterwards) and create a new one. Note that you will need to download the kubeconfig again to keep interacting with the cluster.
diff --git a/docs/commands/secret.md b/docs/commands/secret.md
@@ -73,8 +73,8 @@ scw secret secret create [arg=value ...]
 | ephemeral-policy.time-to-live |  | Time frame, from one second and up to one year, during which the secret's versions are valid. |
 | ephemeral-policy.expires-once-accessed |  | Returns `true` if the version expires after a single user access. |
 | ephemeral-policy.action | One of: `unknown_action`, `delete`, `disable` | Action to perform when the version of a secret expires |
-| protected |  | Returns `true` if secret protection is enabled on a given secret |
-| key-id |  | The Scaleway's Key Manager key ID |
+| protected |  | Returns `true` if secret protection is applied to a given secret |
+| key-id |  | ID of the Scaleway Key Manager key |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.13.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250415141343-ed7d8fa2ef23
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250422095315-6f998f4655ec
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
@@ -462,8 +462,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250415141343-ed7d8fa2ef23 h1:ahwe042nQ9ZfsUnoMIAvzctygyQAAu7sdVXswFP2KT8=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250415141343-ed7d8fa2ef23/go.mod h1:w4o02EHpO0CBGy2nehzWRaFQKd62G9HIf+Q07PDaUcE=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250422095315-6f998f4655ec h1:XLNQFZzigDYXgdRHPxuV3w5VnKvnsCVbl8HBpvDYu40=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250422095315-6f998f4655ec/go.mod h1:w4o02EHpO0CBGy2nehzWRaFQKd62G9HIf+Q07PDaUcE=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -16,7 +16,7 @@ import (
 const (
 	ScwConfigPathEnv = "SCW_CLI_CONFIG_PATH"
 
-	DefaultConfigFileName   = "cli.yaml"
+	DefaultConfigFileName   = "config.yaml"
 	defaultConfigPermission = 0o644
 
 	DefaultOutput      = "human"
diff --git a/internal/namespaces/alias/alias.go b/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 store in cli config file, Default path for this configuration file is based on the following priority order:
+Aliases are stored 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/cli.yaml
-- $HOME/.config/scw/cli.yaml
-- $USERPROFILE/.config/scw/cli.yaml
+- $XDG_CONFIG_HOME/scw/config.yaml
+- $HOME/.config/scw/config.yaml
+- $USERPROFILE/.config/scw/config.yaml
 
 You can use multiple aliases in one command
 aliases in your commands are evaluated and you get completion
diff --git a/internal/namespaces/config/commands.go b/internal/namespaces/config/commands.go
@@ -290,7 +290,12 @@ The only allowed attributes are access_key, secret_key, default_organization_id,
 			configPath := core.ExtractConfigPath(ctx)
 			config, err := scw.LoadConfigFromPath(configPath)
 			if err != nil {
-				return nil, err
+				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
+				}
 			}
 
 			// send_telemetry is the only key that is not in a profile but in the config object directly
@@ -316,7 +321,6 @@ 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 {
diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go
@@ -36,7 +36,6 @@ func GetGeneratedCommands() *core.Commands {
 		k8sClusterListAvailableVersions(),
 		k8sClusterListAvailableTypes(),
 		k8sClusterResetAdminToken(),
-		k8sClusterMigrateToSbsCsi(),
 		k8sACLList(),
 		k8sACLAdd(),
 		k8sACLSet(),
@@ -1309,47 +1308,6 @@ func k8sClusterResetAdminToken() *core.Command {
 	}
 }
 
-func k8sClusterMigrateToSbsCsi() *core.Command {
-	return &core.Command{
-		Short: `Migrate a cluster to SBS CSI`,
-		Long: `Enable the latest CSI compatible with Scaleway Block Storage (SBS) and migrate all existing PersistentVolumes/VolumeSnapshotContents to SBS.
-Make sure to have the necessary Quota before running this command.`,
-		Namespace: "k8s",
-		Resource:  "cluster",
-		Verb:      "migrate-to-sbs-csi",
-		// Deprecated:    false,
-		ArgsType: reflect.TypeOf(k8s.MigrateClusterToSBSCSIRequest{}),
-		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "cluster-id",
-				Short:      `Cluster ID for which the latest CSI compatible with Scaleway Block Storage will be enabled`,
-				Required:   true,
-				Deprecated: false,
-				Positional: true,
-			},
-			core.RegionArgSpec(
-				scw.RegionFrPar,
-				scw.RegionNlAms,
-				scw.RegionPlWaw,
-			),
-		},
-		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
-			request := args.(*k8s.MigrateClusterToSBSCSIRequest)
-
-			client := core.ExtractClient(ctx)
-			api := k8s.NewAPI(client)
-
-			return api.MigrateClusterToSBSCSI(request)
-		},
-		Examples: []*core.Example{
-			{
-				Short: "Migrate a cluster to SBS CSI",
-				Raw:   `scw k8s cluster migrate-to-sbs-csi 11111111-1111-1111-1111-111111111111`,
-			},
-		},
-	}
-}
-
 func k8sACLList() *core.Command {
 	return &core.Command{
 		Short:     `List ACLs`,
diff --git a/internal/namespaces/secret/v1beta1/secret_cli.go b/internal/namespaces/secret/v1beta1/secret_cli.go
@@ -151,14 +151,14 @@ func secretSecretCreate() *core.Command {
 			},
 			{
 				Name:       "protected",
-				Short:      `Returns ` + "`" + `true` + "`" + ` if secret protection is enabled on a given secret`,
+				Short:      `Returns ` + "`" + `true` + "`" + ` if secret protection is applied to a given secret`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "key-id",
-				Short:      `The Scaleway's Key Manager key ID`,
+				Short:      `ID of the Scaleway Key Manager key`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
