Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-audit-trail-event-list-usage.golden

@@ -7,16 +7,17 @@ USAGE:
 
 ARGS:
   [project-id]        (Optional) ID of the Project containing the Audit Trail events
-  [resource-type]     (Optional) Returns a paginated list of Scaleway resources' features (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot)
+  [resource-type]     (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot)
   [method-name]       (Optional) Name of the method of the API call performed
   [status]            (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied
   [recorded-after]    (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default
   [recorded-before]   (Optional) The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Returns `now` by default
   [order-by]           (recorded_at_desc | recorded_at_asc)
   [page-size]         
   [page-token]        
-  [product-name]      (Optional) Name of the Scaleway resource in a hyphenated format
+  [product-name]      (Optional) Name of the Scaleway product in a hyphenated format
   [service-name]      (Optional) Name of the service of the API call performed
+  [resource-id]       (Optional) ID of the Scaleway resource
   [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams)
 

cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden

@@ -13,9 +13,10 @@ EXAMPLES:
     scw baremetal server reboot 11111111-1111-1111-1111-111111111111 boot-type=rescue
 
 ARGS:
-  server-id            ID of the server to reboot
-  [boot-type=normal]   The type of boot (unknown_boot_type | normal | rescue)
-  [zone=fr-par-1]      Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
+  server-id               ID of the server to reboot
+  [boot-type=normal]      The type of boot (unknown_boot_type | normal | rescue)
+  [ssh-key-ids.{index}]   Additional SSH public key IDs to configure on rescue image
+  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for reboot

cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden

@@ -13,9 +13,10 @@ EXAMPLES:
     scw baremetal server start 11111111-1111-1111-1111-111111111111 boot-type=rescue
 
 ARGS:
-  server-id         ID of the server to start
-  [boot-type]       The type of boot (unknown_boot_type | normal | rescue)
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
+  server-id               ID of the server to start
+  [boot-type]             The type of boot (unknown_boot_type | normal | rescue)
+  [ssh-key-ids.{index}]   Additional SSH public key IDs to configure on rescue image
+  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for start

docs/commands/audit-trail.md

@@ -29,16 +29,17 @@ scw audit-trail event list [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | project-id |  | (Optional) ID of the Project containing the Audit Trail events |
-| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot` | (Optional) Returns a paginated list of Scaleway resources' features |
+| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot` | (Optional) Type of the Scaleway resource |
 | method-name |  | (Optional) Name of the method of the API call performed |
 | status |  | (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied |
 | recorded-after |  | (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default |
 | recorded-before |  | (Optional) The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Returns `now` by default |
 | order-by | One of: `recorded_at_desc`, `recorded_at_asc` |  |
 | page-size |  |  |
 | page-token |  |  |
-| product-name |  | (Optional) Name of the Scaleway resource in a hyphenated format |
+| product-name |  | (Optional) Name of the Scaleway product in a hyphenated format |
 | service-name |  | (Optional) Name of the service of the API call performed |
+| resource-id |  | (Optional) ID of the Scaleway resource |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams` | Region to target. If none is passed will use default region from the config |
 

docs/commands/baremetal.md

@@ -788,6 +788,7 @@ scw baremetal server reboot <server-id ...> [arg=value ...]
 |------|---|-------------|
 | server-id | Required | ID of the server to reboot |
 | boot-type | Default: `normal`<br />One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
+| ssh-key-ids.{index} |  | Additional SSH public key IDs to configure on rescue image |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
@@ -824,6 +825,7 @@ scw baremetal server start <server-id ...> [arg=value ...]
 |------|---|-------------|
 | server-id | Required | ID of the server to start |
 | boot-type | One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
+| ssh-key-ids.{index} |  | Additional SSH public key IDs to configure on rescue image |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 

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.34.0.20250904135859-8624843a6792
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10

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.34.0.20250904135859-8624843a6792 h1:WPquMrzwOgY3RFN8m3NGVdUK+R92Fva9DMq+okbBxuY=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250904135859-8624843a6792/go.mod h1:2Cfo14o/ZO3hZg9GjbyD/BHKbyri3K5BiEHq4fBcUHY=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd h1:Ax3NpbStk0L6cprh1CTJda+qjZ/39ZMwC9DxxtAkFUI=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd/go.mod h1:2Cfo14o/ZO3hZg9GjbyD/BHKbyri3K5BiEHq4fBcUHY=
 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=

internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go

@@ -72,7 +72,7 @@ func auditTrailEventList() *core.Command {
 			},
 			{
 				Name:       "resource-type",
-				Short:      `(Optional) Returns a paginated list of Scaleway resources' features`,
+				Short:      `(Optional) Type of the Scaleway resource`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -164,7 +164,7 @@ func auditTrailEventList() *core.Command {
 			},
 			{
 				Name:       "product-name",
-				Short:      `(Optional) Name of the Scaleway resource in a hyphenated format`,
+				Short:      `(Optional) Name of the Scaleway product in a hyphenated format`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -176,6 +176,13 @@ func auditTrailEventList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "resource-id",
+				Short:      `(Optional) ID of the Scaleway resource`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 			core.RegionArgSpec(
 				scw.RegionFrPar,

internal/namespaces/baremetal/v1/baremetal_cli.go

@@ -944,6 +944,13 @@ func baremetalServerReboot() *core.Command {
 					"rescue",
 				},
 			},
+			{
+				Name:       "ssh-key-ids.{index}",
+				Short:      `Additional SSH public key IDs to configure on rescue image`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
 				scw.ZoneFrPar2,
@@ -1003,6 +1010,13 @@ func baremetalServerStart() *core.Command {
 					"rescue",
 				},
 			},
+			{
+				Name:       "ssh-key-ids.{index}",
+				Short:      `Additional SSH public key IDs to configure on rescue image`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
 				scw.ZoneFrPar2,