Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 57ebe50674e5 · 2026-01-07T13:10:21.000+01: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
@@ -8,8 +8,8 @@ USAGE:
 
 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)
+  name               Data source name
+  type               Data source type (unknown_type | metrics | logs | traces)
   [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)
 
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
@@ -6,10 +6,10 @@ 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. 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)
+  [order-by]        Sort order for data sources in the response (created_at_asc | created_at_desc | name_asc | name_desc | type_asc | type_desc)
   [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-token-create-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-create-usage.golden
@@ -8,7 +8,7 @@ USAGE:
 
 ARGS:
   [project-id]             Project ID to use. If none is passed the default project ID will be used
-  [name]                   Name of the token
+  name                     Name of the token
   [token-scopes.{index}]   Token permission scopes (unknown_scope | read_only_metrics | write_only_metrics | full_access_metrics_rules | read_only_logs | write_only_logs | full_access_logs_rules | full_access_alert_manager | read_only_traces | write_only_traces)
   [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-cockpit-token-list-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-list-usage.golden
@@ -7,9 +7,9 @@ USAGE:
   scw cockpit token list [arg=value ...]
 
 ARGS:
-  [order-by]               Order in which to return results (created_at_asc | created_at_desc | name_asc | name_desc)
   [project-id]             Project ID to use. If none is passed the default project ID will be used
   [token-scopes.{index}]   Token scopes to filter for (unknown_scope | read_only_metrics | write_only_metrics | full_access_metrics_rules | read_only_logs | write_only_logs | full_access_logs_rules | full_access_alert_manager | read_only_traces | write_only_traces)
+  [order-by]               Order in which to return results (created_at_asc | created_at_desc | name_asc | name_desc)
   [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/docs/commands/cockpit.md b/docs/commands/cockpit.md
@@ -201,8 +201,8 @@ scw cockpit data-source create [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | 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 |
+| name | Required | Data source name |
+| type | Required<br />One of: `unknown_type`, `metrics`, `logs`, `traces` | Data source type |
 | 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 |
 
@@ -263,10 +263,10 @@ scw cockpit data-source list [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| 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. 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 |
+| 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 |
 | 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 |
 
 
@@ -601,7 +601,7 @@ scw cockpit token create [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
-| name |  | Name of the token |
+| name | Required | Name of the token |
 | token-scopes.{index} | One of: `unknown_scope`, `read_only_metrics`, `write_only_metrics`, `full_access_metrics_rules`, `read_only_logs`, `write_only_logs`, `full_access_logs_rules`, `full_access_alert_manager`, `read_only_traces`, `write_only_traces` | Token permission scopes |
 | 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 |
 
@@ -663,9 +663,9 @@ scw cockpit token list [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc` | Order in which to return results |
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
 | token-scopes.{index} | One of: `unknown_scope`, `read_only_metrics`, `write_only_metrics`, `full_access_metrics_rules`, `read_only_logs`, `write_only_logs`, `full_access_logs_rules`, `full_access_alert_manager`, `read_only_traces`, `write_only_traces` | Token scopes to filter for |
+| order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc` | Order in which to return results |
 | 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 |
 
 
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.26.3
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20251231090604-170adc175025
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260107085608-8e8f76c5afac
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
diff --git a/go.sum b/go.sum
@@ -468,8 +468,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 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.36.0.20251231090604-170adc175025 h1:PGrR+ZrTify2ZSWffLal3oyfL19PViJsn/wQAPsyT1A=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20251231090604-170adc175025/go.mod h1:LEsDu4BubxK7/cWhtlQWfuxwL4rf/2UEpxXz1o1EMtM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260107085608-8e8f76c5afac h1:6k+C/FKpLBvJgjFZXqxQsOaUAwnFM9VDUIaQgtHxL84=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260107085608-8e8f76c5afac/go.mod h1:LEsDu4BubxK7/cWhtlQWfuxwL4rf/2UEpxXz1o1EMtM=
 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.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=
diff --git a/internal/namespaces/cockpit/v1/cockpit_cli.go b/internal/namespaces/cockpit/v1/cockpit_cli.go
@@ -556,14 +556,14 @@ The name of the data source will then be used as reference to name the associate
 			{
 				Name:       "name",
 				Short:      `Data source name`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "type",
 				Short:      `Data source type`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
 				Positional: false,
 				EnumValues: []string{
@@ -682,21 +682,6 @@ func cockpitDataSourceList() *core.Command {
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(cockpit.RegionalAPIListDataSourcesRequest{}),
 		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "order-by",
-				Short:      `Sort order for data sources in the response`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-				EnumValues: []string{
-					"created_at_asc",
-					"created_at_desc",
-					"name_asc",
-					"name_desc",
-					"type_asc",
-					"type_desc",
-				},
-			},
 			core.ProjectIDArgSpec(),
 			{
 				Name:       "origin",
@@ -724,6 +709,21 @@ func cockpitDataSourceList() *core.Command {
 					"traces",
 				},
 			},
+			{
+				Name:       "order-by",
+				Short:      `Sort order for data sources in the response`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"created_at_asc",
+					"created_at_desc",
+					"name_asc",
+					"name_desc",
+					"type_asc",
+					"type_desc",
+				},
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
@@ -848,7 +848,7 @@ Upon creation, your token's secret key display only once. Make sure that you sav
 			{
 				Name:       "name",
 				Short:      `Name of the token`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
 				Positional: false,
 			},
@@ -899,19 +899,6 @@ You can filter tokens by Project ID and token scopes.`,
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(cockpit.RegionalAPIListTokensRequest{}),
 		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "order-by",
-				Short:      `Order in which to return results`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-				EnumValues: []string{
-					"created_at_asc",
-					"created_at_desc",
-					"name_asc",
-					"name_desc",
-				},
-			},
 			core.ProjectIDArgSpec(),
 			{
 				Name:       "token-scopes.{index}",
@@ -932,6 +919,19 @@ You can filter tokens by Project ID and token scopes.`,
 					"write_only_traces",
 				},
 			},
+			{
+				Name:       "order-by",
+				Short:      `Order in which to return results`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"created_at_asc",
+					"created_at_desc",
+					"name_asc",
+					"name_desc",
+				},
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
