Merge branch 'scaleway:master' into master

Author: scaleway-bot

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

@@ -7,7 +7,7 @@ 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)
+  [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)
   [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

cmd/scw/testdata/test-all-usage-keymanager-key-list-usage.golden

@@ -10,6 +10,7 @@ ARGS:
   [order-by]           (name_asc | name_desc | created_at_asc | created_at_desc | updated_at_asc | updated_at_desc)
   [tags.{index}]      (Optional) List of tags to filter on
   [name]              (Optional) Filter by key name
+  [usage]             (Optional) Filter keys by usage. (unknown_usage | symmetric_encryption | asymmetric_encryption | asymmetric_signing)
   [organization-id]   (Optional) Filter by Organization ID
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 

docs/commands/audit-trail.md

@@ -29,7 +29,7 @@ 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` | (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` | (Optional) Returns a paginated list of Scaleway resources' features |
 | 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 |

docs/commands/keymanager.md

@@ -264,6 +264,7 @@ scw keymanager key list [arg=value ...]
 | order-by | One of: `name_asc`, `name_desc`, `created_at_asc`, `created_at_desc`, `updated_at_asc`, `updated_at_desc` |  |
 | tags.{index} |  | (Optional) List of tags to filter on |
 | name |  | (Optional) Filter by key name |
+| usage | One of: `unknown_usage`, `symmetric_encryption`, `asymmetric_encryption`, `asymmetric_signing` | (Optional) Filter keys by usage. |
 | organization-id |  | (Optional) Filter by Organization ID |
 | 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 |
 

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.20250507151153-c2221170c9cc
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6

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.20250507151153-c2221170c9cc h1:BG7CJh8I2AuyMP0ie6sOqAGYn5jifL4piKBZCva9C5M=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250507151153-c2221170c9cc/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82 h1:HiThszq4WsYeLYznJjVm0RlsBw5uRalTPp3YEl5b0sc=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250513115908-b0f902104f82/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
 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

@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	audit_trail "github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -95,6 +95,8 @@ func auditTrailEventList() *core.Command {
 					"secret_manager_secret",
 					"secret_manager_version",
 					"key_manager_key",
+					"account_user",
+					"account_organization",
 				},
 			},
 			{

internal/namespaces/inference/v1beta1/custom_endpoint.go

@@ -42,9 +42,7 @@ func endpointCreateBuilder(c *core.Command) *core.Command {
 			endpointToCreate.Public = publicEndpoint
 		}
 		if endpoint.PrivateNetwork != nil && endpoint.PrivateNetwork.PrivateNetworkID != "" {
-			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{
-				PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID,
-			}
+			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID}
 		}
 		createEndpointreq.Endpoint = &endpointToCreate
 

internal/namespaces/key_manager/v1alpha1/key_manager_cli.go

@@ -537,6 +537,19 @@ func keymanagerKeyList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "usage",
+				Short:      `(Optional) Filter keys by usage.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"unknown_usage",
+					"symmetric_encryption",
+					"asymmetric_encryption",
+					"asymmetric_signing",
+				},
+			},
 			{
 				Name:       "organization-id",
 				Short:      `(Optional) Filter by Organization ID`,