Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 090bcfbae425 · 2025-06-16T20:11:09.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-cockpit-data-source-create-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-data-source-create-usage.golden
@@ -1,9 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-You must specify the data source type upon creation. Available data source types include:
-  - metrics
-  - logs
-  - traces
+You must specify the data source name and type (metrics, logs, traces) upon creation.
 The name of the data source will then be used as reference to name the associated Grafana data source.
 
 USAGE:
@@ -13,7 +10,7 @@ ARGS:
   [project-id]       Project ID to use. If none is passed the default project ID will be used
   [name]             Data source name
   [type]             Data source type (unknown_type | metrics | logs | traces)
-  [retention-days]   BETA - Duration for which the data will be retained in the data source
+  [retention-days]   Duration for which the data will be retained in the data source
   [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-cockpit-data-source-delete-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-data-source-delete-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Delete a given data source, specified by the data source ID. Note that deleting a data source is irreversible, and cannot be undone.
+Delete a given data source. Note that this action will permanently delete this data source and any data associated with it.
 
 USAGE:
   scw cockpit data-source delete [arg=value ...]
diff --git a/cmd/scw/testdata/test-all-usage-cockpit-data-source-list-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-data-source-list-usage.golden
@@ -1,16 +1,15 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
 Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
-You can list data sources by Project, type and origin.
 
 USAGE:
   scw cockpit data-source list [arg=value ...]
 
 ARGS:
   [order-by]        Sort order for data sources in the response (created_at_asc | created_at_desc | name_asc | name_desc | type_asc | type_desc)
   [project-id]      Project ID to use. If none is passed the default project ID will be used
-  [origin]          Origin to filter for, only data sources with matching origin will be returned (unknown_origin | scaleway | external | custom)
-  [types.{index}]   Types to filter for, only data sources with matching types will be returned (unknown_type | metrics | logs | traces)
+  [origin]          Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned (unknown_origin | scaleway | external | custom)
+  [types.{index}]   Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned (unknown_type | metrics | logs | traces)
   [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-cockpit-data-source-update-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-data-source-update-usage.golden
@@ -1,14 +1,14 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Update a given data source name, specified by the data source ID.
+Update a given data source attributes (name and/or retention_days).
 
 USAGE:
   scw cockpit data-source update [arg=value ...]
 
 ARGS:
   data-source-id     ID of the data source to update
   [name]             Updated name of the data source
-  [retention-days]   BETA - Duration for which the data will be retained in the data source
+  [retention-days]   Duration for which the data will be retained in the data source
   [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-cockpit-usage-overview-get-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-usage-overview-get-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Retrieve the data source usage overview per type for the specified Project.
+Retrieve the volume of data ingested for each of your data sources in the specified project and region.
 
 USAGE:
   scw cockpit usage-overview get [arg=value ...]
diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden
@@ -6,8 +6,8 @@ USAGE:
   scw rdb backup create [arg=value ...]
 
 ARGS:
-  [instance-id]        UUID of the Database Instance
-  [database-name]      Name of the database you want to back up
+  instance-id          UUID of the Database Instance
+  database-name        Name of the database you want to back up
   [name=<generated>]   Name of the backup
   [expires-at]         Expiration date (must follow the ISO 8601 format)
   [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/docs/commands/cockpit.md b/docs/commands/cockpit.md
@@ -188,10 +188,7 @@ Datasource management commands.
 
 ### Create a data source
 
-You must specify the data source type upon creation. Available data source types include:
-  - metrics
-  - logs
-  - traces
+You must specify the data source name and type (metrics, logs, traces) upon creation.
 The name of the data source will then be used as reference to name the associated Grafana data source.
 
 **Usage:**
@@ -208,14 +205,14 @@ scw cockpit data-source create [arg=value ...]
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
 | name |  | Data source name |
 | type | One of: `unknown_type`, `metrics`, `logs`, `traces` | Data source type |
-| retention-days |  | BETA - Duration for which the data will be retained in the data source |
+| retention-days |  | Duration for which the data will be retained in the data source |
 | 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 |
 
 
 
 ### Delete a data source
 
-Delete a given data source, specified by the data source ID. Note that deleting a data source is irreversible, and cannot be undone.
+Delete a given data source. Note that this action will permanently delete this data source and any data associated with it.
 
 **Usage:**
 
@@ -256,7 +253,6 @@ scw cockpit data-source get [arg=value ...]
 ### List data sources
 
 Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
-You can list data sources by Project, type and origin.
 
 **Usage:**
 
@@ -271,15 +267,15 @@ scw cockpit data-source list [arg=value ...]
 |------|---|-------------|
 | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc`, `type_asc`, `type_desc` | Sort order for data sources in the response |
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
-| origin | One of: `unknown_origin`, `scaleway`, `external`, `custom` | Origin to filter for, only data sources with matching origin will be returned |
-| types.{index} | One of: `unknown_type`, `metrics`, `logs`, `traces` | Types to filter for, only data sources with matching types will be returned |
+| origin | One of: `unknown_origin`, `scaleway`, `external`, `custom` | Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned |
+| types.{index} | One of: `unknown_type`, `metrics`, `logs`, `traces` | Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 
 
 
 ### Update a data source
 
-Update a given data source name, specified by the data source ID.
+Update a given data source attributes (name and/or retention_days).
 
 **Usage:**
 
@@ -294,7 +290,7 @@ scw cockpit data-source update [arg=value ...]
 |------|---|-------------|
 | data-source-id | Required | ID of the data source to update |
 | name |  | Updated name of the data source |
-| retention-days |  | BETA - Duration for which the data will be retained in the data source |
+| retention-days |  | Duration for which the data will be retained in the data source |
 | 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 |
 
 
@@ -710,7 +706,7 @@ Usage overview management commands.
 
 ### Get data source usage overview
 
-Retrieve the data source usage overview per type for the specified Project.
+Retrieve the volume of data ingested for each of your data sources in the specified project and region.
 
 **Usage:**
 
diff --git a/docs/commands/rdb.md b/docs/commands/rdb.md
@@ -215,8 +215,8 @@ scw rdb backup create [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| instance-id |  | UUID of the Database Instance |
-| database-name |  | Name of the database you want to back up |
+| instance-id | Required | UUID of the Database Instance |
+| database-name | Required | Name of the database you want to back up |
 | name | Default: `<generated>` | Name of the backup |
 | expires-at |  | Expiration date (must follow the ISO 8601 format) |
 | 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.20250612160241-cb8e35ad61c5
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250616150134-9c1bc4cca50a
 	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.20250612160241-cb8e35ad61c5 h1:c13eCwQV4J6zi5v43Xd2c2xwbkfUU8t1zxstAt6picQ=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250612160241-cb8e35ad61c5/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250616150134-9c1bc4cca50a h1:p6Zw2NuBsVe9jMhTFtvzDBJYsupKmtV86wEqf5oDevo=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250616150134-9c1bc4cca50a/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
 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/cockpit/v1/cockpit_cli.go b/internal/namespaces/cockpit/v1/cockpit_cli.go
@@ -542,10 +542,7 @@ Deprecated: retention is now managed at the data source level.`,
 func cockpitDataSourceCreate() *core.Command {
 	return &core.Command{
 		Short: `Create a data source`,
-		Long: `You must specify the data source type upon creation. Available data source types include:
-  - metrics
-  - logs
-  - traces
+		Long: `You must specify the data source name and type (metrics, logs, traces) upon creation.
 The name of the data source will then be used as reference to name the associated Grafana data source.`,
 		Namespace: "cockpit",
 		Resource:  "data-source",
@@ -576,7 +573,7 @@ The name of the data source will then be used as reference to name the associate
 			},
 			{
 				Name:       "retention-days",
-				Short:      `BETA - Duration for which the data will be retained in the data source`,
+				Short:      `Duration for which the data will be retained in the data source`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -635,7 +632,7 @@ func cockpitDataSourceGet() *core.Command {
 func cockpitDataSourceDelete() *core.Command {
 	return &core.Command{
 		Short:     `Delete a data source`,
-		Long:      `Delete a given data source, specified by the data source ID. Note that deleting a data source is irreversible, and cannot be undone.`,
+		Long:      `Delete a given data source. Note that this action will permanently delete this data source and any data associated with it.`,
 		Namespace: "cockpit",
 		Resource:  "data-source",
 		Verb:      "delete",
@@ -675,9 +672,8 @@ func cockpitDataSourceDelete() *core.Command {
 
 func cockpitDataSourceList() *core.Command {
 	return &core.Command{
-		Short: `List data sources`,
-		Long: `Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.
-You can list data sources by Project, type and origin.`,
+		Short:     `List data sources`,
+		Long:      `Retrieve the list of data sources available in the specified region. By default, the data sources returned in the list are ordered by creation date, in ascending order.`,
 		Namespace: "cockpit",
 		Resource:  "data-source",
 		Verb:      "list",
@@ -702,7 +698,7 @@ You can list data sources by Project, type and origin.`,
 			core.ProjectIDArgSpec(),
 			{
 				Name:       "origin",
-				Short:      `Origin to filter for, only data sources with matching origin will be returned`,
+				Short:      `Origin to filter for, only data sources with matching origin will be returned. If omitted, all types will be returned`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -715,7 +711,7 @@ You can list data sources by Project, type and origin.`,
 			},
 			{
 				Name:       "types.{index}",
-				Short:      `Types to filter for, only data sources with matching types will be returned`,
+				Short:      `Types to filter for (metrics, logs, traces), only data sources with matching types will be returned. If omitted, all types will be returned`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -756,7 +752,7 @@ You can list data sources by Project, type and origin.`,
 func cockpitDataSourceUpdate() *core.Command {
 	return &core.Command{
 		Short:     `Update a data source`,
-		Long:      `Update a given data source name, specified by the data source ID.`,
+		Long:      `Update a given data source attributes (name and/or retention_days).`,
 		Namespace: "cockpit",
 		Resource:  "data-source",
 		Verb:      "update",
@@ -779,7 +775,7 @@ func cockpitDataSourceUpdate() *core.Command {
 			},
 			{
 				Name:       "retention-days",
-				Short:      `BETA - Duration for which the data will be retained in the data source`,
+				Short:      `Duration for which the data will be retained in the data source`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -804,7 +800,7 @@ func cockpitDataSourceUpdate() *core.Command {
 func cockpitUsageOverviewGet() *core.Command {
 	return &core.Command{
 		Short:     `Get data source usage overview`,
-		Long:      `Retrieve the data source usage overview per type for the specified Project.`,
+		Long:      `Retrieve the volume of data ingested for each of your data sources in the specified project and region.`,
 		Namespace: "cockpit",
 		Resource:  "usage-overview",
 		Verb:      "get",
diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go
@@ -441,14 +441,14 @@ func rdbBackupCreate() *core.Command {
 			{
 				Name:       "instance-id",
 				Short:      `UUID of the Database Instance`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "database-name",
 				Short:      `Name of the database you want to back up`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
 				Positional: false,
 			},
