Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 3f43143bcd01 · 2025-05-02T20:11:05.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden
@@ -30,6 +30,7 @@ ARGS:
   [health-check.http.path]                         Path to use for the HTTP health check.
   [health-check.failure-threshold]                 Number of consecutive health check failures before considering the container unhealthy.
   [health-check.interval]                          Period between health checks.
+  [tags.{index}]                                   Tags of the Serverless Container
   [deploy=true]                                    Deploy container after creation
   [region=fr-par]                                  Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
diff --git a/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden
@@ -30,6 +30,7 @@ ARGS:
   [health-check.http.path]                         Path to use for the HTTP health check.
   [health-check.failure-threshold]                 Number of consecutive health check failures before considering the container unhealthy.
   [health-check.interval]                          Period between health checks.
+  [tags.{index}]                                   Tags of the Serverless Container
   [region=fr-par]                                  Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 DEPRECATED ARGS:
diff --git a/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden
@@ -12,7 +12,7 @@ ARGS:
   [description]                                  Description of the namespace to create
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
-  [tags.{index}]                                 [ALPHA] Tags of the Serverless Container Namespace
+  [tags.{index}]                                 Tags of the Serverless Container Namespace
   [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/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [description]                                  Description of the namespace to update
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
-  [tags.{index}]                                 [ALPHA] Tags of the Serverless Container Namespace
+  [tags.{index}]                                 Tags of the Serverless Container Namespace
   [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/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden
@@ -21,6 +21,7 @@ ARGS:
   [secret-environment-variables.{index}.value]   
   [http-option=enabled]                          Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected)
   [sandbox]                                      Execution environment of the function (unknown_sandbox | v1 | v2)
+  [tags.{index}]                                 Tags of the Serverless Function
   [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/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden
@@ -21,6 +21,7 @@ ARGS:
   [secret-environment-variables.{index}.value]   
   [http-option]                                  Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected)
   [sandbox]                                      Execution environment of the function (unknown_sandbox | v1 | v2)
+  [tags.{index}]                                 Tags of the Serverless Function
   [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/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden
@@ -12,7 +12,7 @@ ARGS:
   [description]                                  Description of the namespace
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
-  [tags.{index}]                                 [ALPHA] Tags of the Serverless Function Namespace
+  [tags.{index}]                                 Tags of the Serverless Function Namespace
   [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/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [description]                                  Description of the namespace
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
-  [tags.{index}]                                 [ALPHA] Tags of the Serverless Function Namespace
+  [tags.{index}]                                 Tags of the Serverless Function Namespace
   [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/cmd/scw/testdata/test-all-usage-rdb-setting-edit-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-setting-edit-usage.golden
@@ -0,0 +1,28 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+This command opens the current settings of your RDB instance in your $EDITOR.
+You can modify the values and save the file to apply the new configuration.
+
+USAGE:
+  scw rdb setting edit <instance-id ...> [arg=value ...]
+
+EXAMPLES:
+  Edit instance settings in YAML
+    scw rdb setting edit 12345678-1234-1234-1234-123456789abc --region=fr-par --mode=yaml
+
+  Edit instance settings in JSON
+    scw rdb setting edit 12345678-1234-1234-1234-123456789abc --region=fr-par --mode=json
+
+ARGS:
+  instance-id       ID of the instance
+  [mode=yaml]       marshaling used when editing data (yaml | json)
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for edit
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-setting-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-setting-usage.golden
@@ -12,6 +12,7 @@ USAGE:
 AVAILABLE COMMANDS:
   add         Add Database Instance advanced settings
   delete      Delete Database Instance advanced settings
+  edit        Edit Database Instance settings in your default editor
   set         Set Database Instance advanced settings
 
 FLAGS:
diff --git a/docs/commands/container.md b/docs/commands/container.md
@@ -85,6 +85,7 @@ scw container container create [arg=value ...]
 | health-check.http.path |  | Path to use for the HTTP health check. |
 | health-check.failure-threshold |  | Number of consecutive health check failures before considering the container unhealthy. |
 | health-check.interval |  | Period between health checks. |
+| tags.{index} |  | Tags of the Serverless Container |
 | deploy | Default: `true` | Deploy container after creation |
 | 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 |
 
@@ -214,6 +215,7 @@ scw container container update <container-id ...> [arg=value ...]
 | health-check.http.path |  | Path to use for the HTTP health check. |
 | health-check.failure-threshold |  | Number of consecutive health check failures before considering the container unhealthy. |
 | health-check.interval |  | Period between health checks. |
+| tags.{index} |  | Tags of the Serverless Container |
 | 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 |
 
 
@@ -474,7 +476,7 @@ scw container namespace create [arg=value ...]
 | description |  | Description of the namespace to create |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| tags.{index} |  | [ALPHA] Tags of the Serverless Container Namespace |
+| tags.{index} |  | Tags of the Serverless Container Namespace |
 | 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 |
 
 
@@ -562,7 +564,7 @@ scw container namespace update <namespace-id ...> [arg=value ...]
 | description |  | Description of the namespace to update |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| tags.{index} |  | [ALPHA] Tags of the Serverless Container Namespace |
+| tags.{index} |  | Tags of the Serverless Container Namespace |
 | 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/docs/commands/function.md b/docs/commands/function.md
@@ -304,6 +304,7 @@ scw function function create [arg=value ...]
 | secret-environment-variables.{index}.value |  |  |
 | http-option | Default: `enabled`<br />One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled |
 | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function |
+| tags.{index} |  | Tags of the Serverless Function |
 | 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 |
 
 
@@ -463,6 +464,7 @@ scw function function update <function-id ...> [arg=value ...]
 | secret-environment-variables.{index}.value |  |  |
 | http-option | One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled |
 | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function |
+| tags.{index} |  | Tags of the Serverless Function |
 | 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 |
 
 
@@ -493,7 +495,7 @@ scw function namespace create [arg=value ...]
 | description |  | Description of the namespace |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| tags.{index} |  | [ALPHA] Tags of the Serverless Function Namespace |
+| tags.{index} |  | Tags of the Serverless Function Namespace |
 | 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 |
 
 
@@ -581,7 +583,7 @@ scw function namespace update <namespace-id ...> [arg=value ...]
 | description |  | Description of the namespace |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| tags.{index} |  | [ALPHA] Tags of the Serverless Function Namespace |
+| tags.{index} |  | Tags of the Serverless Function Namespace |
 | 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/docs/commands/rdb.md b/docs/commands/rdb.md
@@ -66,6 +66,7 @@ This API allows you to manage your Managed Databases for PostgreSQL and MySQL.
 - [Setting management](#setting-management)
   - [Add Database Instance advanced settings](#add-database-instance-advanced-settings)
   - [Delete Database Instance advanced settings](#delete-database-instance-advanced-settings)
+  - [Edit Database Instance settings in your default editor](#edit-database-instance-settings-in-your-default-editor)
   - [Set Database Instance advanced settings](#set-database-instance-advanced-settings)
 - [Block snapshot management](#block-snapshot-management)
   - [Create a Database Instance snapshot](#create-a-database-instance-snapshot)
@@ -1398,6 +1399,43 @@ scw rdb setting delete [arg=value ...]
 
 
 
+### Edit Database Instance settings in your default editor
+
+This command opens the current settings of your RDB instance in your $EDITOR.
+You can modify the values and save the file to apply the new configuration.
+
+**Usage:**
+
+```
+scw rdb setting edit <instance-id ...> [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| instance-id | Required | ID of the instance |
+| mode | Default: `yaml`<br />One of: `yaml`, `json` | marshaling used when editing data |
+| 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:**
+
+
+Edit instance settings in YAML
+```
+scw rdb setting edit 12345678-1234-1234-1234-123456789abc --region=fr-par --mode=yaml
+```
+
+Edit instance settings in JSON
+```
+scw rdb setting edit 12345678-1234-1234-1234-123456789abc --region=fr-par --mode=json
+```
+
+
+
+
 ### Set Database Instance advanced settings
 
 Update an advanced setting for a Database Instance. Settings added upon database engine initialization can only be defined once, and cannot, therefore, be updated.
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.20250422095315-6f998f4655ec
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6
 	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
@@ -466,8 +466,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.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/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6 h1:8gDJ72j/by4RH6VDkW9lTPpdve5v7Ou2ypD4ZbGzYvY=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6/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/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go
@@ -272,7 +272,7 @@ func containerNamespaceCreate() *core.Command {
 			},
 			{
 				Name:       "tags.{index}",
-				Short:      `[ALPHA] Tags of the Serverless Container Namespace`,
+				Short:      `Tags of the Serverless Container Namespace`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -339,7 +339,7 @@ func containerNamespaceUpdate() *core.Command {
 			},
 			{
 				Name:       "tags.{index}",
-				Short:      `[ALPHA] Tags of the Serverless Container Namespace`,
+				Short:      `Tags of the Serverless Container Namespace`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -708,6 +708,13 @@ func containerContainerCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags of the Serverless Container`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
@@ -923,6 +930,13 @@ func containerContainerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags of the Serverless Container`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
diff --git a/internal/namespaces/file/v1alpha1/file_cli.go b/internal/namespaces/file/v1alpha1/file_cli.go
@@ -310,9 +310,8 @@ func fileFilesystemDelete() *core.Command {
 
 func fileFilesystemUpdate() *core.Command {
 	return &core.Command{
-		Short: `Update filesystem properties`,
-		Long: `Update the technical details of a filesystem, such as its name, tags or its new size.
-You can only resize a filesystem to a larger size.`,
+		Short:     `Update filesystem properties`,
+		Long:      `Update the technical details of a filesystem, such as its name, tags or its new size.`,
 		Namespace: "file",
 		Resource:  "filesystem",
 		Verb:      "update",
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
@@ -319,7 +319,7 @@ func functionNamespaceCreate() *core.Command {
 			},
 			{
 				Name:       "tags.{index}",
-				Short:      `[ALPHA] Tags of the Serverless Function Namespace`,
+				Short:      `Tags of the Serverless Function Namespace`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -386,7 +386,7 @@ func functionNamespaceUpdate() *core.Command {
 			},
 			{
 				Name:       "tags.{index}",
-				Short:      `[ALPHA] Tags of the Serverless Function Namespace`,
+				Short:      `Tags of the Serverless Function Namespace`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -721,6 +721,13 @@ func functionFunctionCreate() *core.Command {
 					"v2",
 				},
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags of the Serverless Function`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
@@ -903,6 +910,13 @@ func functionFunctionUpdate() *core.Command {
 					"v2",
 				},
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags of the Serverless Function`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
diff --git a/internal/namespaces/rdb/v1/custom.go b/internal/namespaces/rdb/v1/custom.go
@@ -49,6 +49,7 @@ func GetCommands() *core.Commands {
 		instanceConnectCommand(),
 		instanceWaitCommand(),
 		userGetURLCommand(),
+		instanceEditSettingsCommand(),
 	))
 	cmds.MustFind("rdb", "acl", "add").Override(aclAddBuilder)
 	cmds.MustFind("rdb", "acl", "delete").Override(aclDeleteBuilder)
diff --git a/internal/namespaces/rdb/v1/custom_instance.go b/internal/namespaces/rdb/v1/custom_instance.go
