Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 1bb97d39f61b · 2025-07-17T20:10:36.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-audit-trail-event-list-usage.golden b/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 | account_user | account_organization)
+  [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 | instance_server | apple_silicon_server)
   [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
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
@@ -39,6 +39,7 @@ ARGS:
   [install.partitioning-schema.zfs.pools.{index}.options.{index}]                          
   [install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index}]               
   [option-ids.{index}]                                                                     IDs of options to enable on server
+  [protected]                                                                              If enabled, the server can not be deleted
   [organization-id]                                                                        Organization ID to use. If none is passed the default organization ID will be used
   [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)
 
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Update the server associated with the ID. You can update parameters such as the server's name, tags and description. Any parameters left null in the request body are not updated.
+Update the server associated with the ID. You can update parameters such as the server's name, tags, description and protection flag. Any parameters left null in the request body are not updated.
 
 USAGE:
   scw baremetal server update <server-id ...> [arg=value ...]
@@ -10,6 +10,7 @@ ARGS:
   [name]            Name of the server (≠hostname), not updated if null
   [description]     Description associated with the server, max 255 characters, not updated if null
   [tags.{index}]    Tags associated with the server, not updated if null
+  [protected]       If enabled, the server can not be deleted
   [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:
diff --git a/cmd/scw/testdata/test-all-usage-edge-services-cache-stage-create-usage.golden b/cmd/scw/testdata/test-all-usage-edge-services-cache-stage-create-usage.golden
@@ -7,6 +7,7 @@ USAGE:
 
 ARGS:
   [fallback-ttl=3600s]   Time To Live (TTL) in seconds. Defines how long content is cached
+  [include-cookies]      Defines whether responses to requests with cookies must be stored in the cache
   [backend-stage-id]     Backend stage ID the cache stage will be linked to
   pipeline-id            Pipeline ID the Cache stage belongs to
   [waf-stage-id]         
diff --git a/cmd/scw/testdata/test-all-usage-edge-services-cache-stage-update-usage.golden b/cmd/scw/testdata/test-all-usage-edge-services-cache-stage-update-usage.golden
@@ -1,13 +1,14 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Update the parameters of an existing cache stage, specified by its `cache_stage_id`. Parameters which can be updated include the `fallback_ttl` and `backend_stage_id`.
+Update the parameters of an existing cache stage, specified by its `cache_stage_id`. Parameters which can be updated include the `fallback_ttl`, `include_cookies` and `backend_stage_id`.
 
 USAGE:
   scw edge-services cache-stage update <cache-stage-id ...> [arg=value ...]
 
 ARGS:
   cache-stage-id       ID of the cache stage to update
   [fallback-ttl]       Time To Live (TTL) in seconds. Defines how long content is cached
+  [include-cookies]    Defines whether responses to requests with cookies must be stored in the cache
   [backend-stage-id]   Backend stage ID the cache stage will be linked to
   [waf-stage-id]       
   [route-stage-id]     
diff --git a/cmd/scw/testdata/test-all-usage-interlink-link-create-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-link-create-usage.golden
@@ -14,6 +14,7 @@ ARGS:
   [connection-id]   If set, creates a self-hosted link using this dedicated physical connection. As the customer, specify the ID of the physical connection you already have for this link.
   [partner-id]      If set, creates a hosted link on a partner's connection. Specify the ID of the chosen partner, who already has a shared connection with available bandwidth.
   [peer-asn]        For self-hosted links we need the peer AS Number to establish BGP session. If not given, a default one will be assigned.
+  [vlan]            For self-hosted links only, it is possible to choose the VLAN ID. If the VLAN is not available (ie already taken or out of range), an error is returned.
   [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-ipam-ip-list-usage.golden b/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden
@@ -6,7 +6,7 @@ USAGE:
   scw ipam ip list [arg=value ...]
 
 ARGS:
-  [order-by]                 Sort order of the returned IPs (created_at_desc | created_at_asc | updated_at_desc | updated_at_asc | attached_at_desc | attached_at_asc)
+  [order-by]                 Sort order of the returned IPs (created_at_desc | created_at_asc | updated_at_desc | updated_at_asc | attached_at_desc | attached_at_asc | ip_address_desc | ip_address_asc | mac_address_desc | mac_address_asc)
   [project-id]               Project ID to filter for. Only IPs belonging to this Project will be returned
   [zonal]                    Zone to filter for. Only IPs that are zonal, and in this zone, will be returned
   [private-network-id]       Private Network to filter for.
diff --git a/docs/commands/audit-trail.md b/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`, `account_user`, `account_organization` | (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`, `instance_server`, `apple_silicon_server` | (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 |
diff --git a/docs/commands/baremetal.md b/docs/commands/baremetal.md
@@ -564,6 +564,7 @@ scw baremetal server create [arg=value ...]
 | install.partitioning-schema.zfs.pools.{index}.options.{index} |  |  |
 | install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index} |  |  |
 | option-ids.{index} |  | IDs of options to enable on server |
+| protected |  | If enabled, the server can not be deleted |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
 | 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 |
 
@@ -874,7 +875,7 @@ scw baremetal server stop 11111111-1111-1111-1111-111111111111
 
 ### Update an Elastic Metal server
 
-Update the server associated with the ID. You can update parameters such as the server's name, tags and description. Any parameters left null in the request body are not updated.
+Update the server associated with the ID. You can update parameters such as the server's name, tags, description and protection flag. Any parameters left null in the request body are not updated.
 
 **Usage:**
 
@@ -891,6 +892,7 @@ scw baremetal server update <server-id ...> [arg=value ...]
 | name |  | Name of the server (≠hostname), not updated if null |
 | description |  | Description associated with the server, max 255 characters, not updated if null |
 | tags.{index} |  | Tags associated with the server, not updated if null |
+| protected |  | If enabled, the server can not be deleted |
 | 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 |
 
 
diff --git a/docs/commands/edge-services.md b/docs/commands/edge-services.md
@@ -196,6 +196,7 @@ scw edge-services cache-stage create [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | fallback-ttl | Default: `3600s` | Time To Live (TTL) in seconds. Defines how long content is cached |
+| include-cookies |  | Defines whether responses to requests with cookies must be stored in the cache |
 | backend-stage-id |  | Backend stage ID the cache stage will be linked to |
 | pipeline-id | Required | Pipeline ID the Cache stage belongs to |
 | waf-stage-id |  |  |
@@ -263,7 +264,7 @@ scw edge-services cache-stage list [arg=value ...]
 
 ### Update cache stage
 
-Update the parameters of an existing cache stage, specified by its `cache_stage_id`. Parameters which can be updated include the `fallback_ttl` and `backend_stage_id`.
+Update the parameters of an existing cache stage, specified by its `cache_stage_id`. Parameters which can be updated include the `fallback_ttl`, `include_cookies` and `backend_stage_id`.
 
 **Usage:**
 
@@ -278,6 +279,7 @@ scw edge-services cache-stage update <cache-stage-id ...> [arg=value ...]
 |------|---|-------------|
 | cache-stage-id | Required | ID of the cache stage to update |
 | fallback-ttl |  | Time To Live (TTL) in seconds. Defines how long content is cached |
+| include-cookies |  | Defines whether responses to requests with cookies must be stored in the cache |
 | backend-stage-id |  | Backend stage ID the cache stage will be linked to |
 | waf-stage-id |  |  |
 | route-stage-id |  |  |
diff --git a/docs/commands/interlink.md b/docs/commands/interlink.md
@@ -113,6 +113,7 @@ scw interlink link create [arg=value ...]
 | connection-id |  | If set, creates a self-hosted link using this dedicated physical connection. As the customer, specify the ID of the physical connection you already have for this link. |
 | partner-id |  | If set, creates a hosted link on a partner's connection. Specify the ID of the chosen partner, who already has a shared connection with available bandwidth. |
 | peer-asn |  | For self-hosted links we need the peer AS Number to establish BGP session. If not given, a default one will be assigned. |
+| vlan |  | For self-hosted links only, it is possible to choose the VLAN ID. If the VLAN is not available (ie already taken or out of range), an error is returned. |
 | 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/ipam.md b/docs/commands/ipam.md
@@ -101,7 +101,7 @@ scw ipam ip list [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| order-by | One of: `created_at_desc`, `created_at_asc`, `updated_at_desc`, `updated_at_asc`, `attached_at_desc`, `attached_at_asc` | Sort order of the returned IPs |
+| order-by | One of: `created_at_desc`, `created_at_asc`, `updated_at_desc`, `updated_at_asc`, `attached_at_desc`, `attached_at_asc`, `ip_address_desc`, `ip_address_asc`, `mac_address_desc`, `mac_address_asc` | Sort order of the returned IPs |
 | project-id |  | Project ID to filter for. Only IPs belonging to this Project will be returned |
 | zonal |  | Zone to filter for. Only IPs that are zonal, and in this zone, will be returned |
 | private-network-id |  | Private Network to filter for. |
diff --git a/internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go b/internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go
@@ -97,6 +97,8 @@ func auditTrailEventList() *core.Command {
 					"key_manager_key",
 					"account_user",
 					"account_organization",
+					"instance_server",
+					"apple_silicon_server",
 				},
 			},
 			{
diff --git a/internal/namespaces/baremetal/v1/baremetal_cli.go b/internal/namespaces/baremetal/v1/baremetal_cli.go
@@ -499,6 +499,13 @@ func baremetalServerCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "protected",
+				Short:      `If enabled, the server can not be deleted`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
@@ -529,7 +536,7 @@ func baremetalServerCreate() *core.Command {
 func baremetalServerUpdate() *core.Command {
 	return &core.Command{
 		Short:     `Update an Elastic Metal server`,
-		Long:      `Update the server associated with the ID. You can update parameters such as the server's name, tags and description. Any parameters left null in the request body are not updated.`,
+		Long:      `Update the server associated with the ID. You can update parameters such as the server's name, tags, description and protection flag. Any parameters left null in the request body are not updated.`,
 		Namespace: "baremetal",
 		Resource:  "server",
 		Verb:      "update",
@@ -564,6 +571,13 @@ func baremetalServerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "protected",
+				Short:      `If enabled, the server can not be deleted`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
 				scw.ZoneFrPar2,
diff --git a/internal/namespaces/edge_services/v1beta1/edge_services_cli.go b/internal/namespaces/edge_services/v1beta1/edge_services_cli.go
@@ -945,6 +945,13 @@ func edgeServicesCacheStageCreate() *core.Command {
 				Positional: false,
 				Default:    core.DefaultValueSetter("3600s"),
 			},
+			{
+				Name:       "include-cookies",
+				Short:      `Defines whether responses to requests with cookies must be stored in the cache`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "backend-stage-id",
 				Short:      `Backend stage ID the cache stage will be linked to`,
@@ -1015,7 +1022,7 @@ func edgeServicesCacheStageGet() *core.Command {
 func edgeServicesCacheStageUpdate() *core.Command {
 	return &core.Command{
 		Short:     `Update cache stage`,
-		Long:      `Update the parameters of an existing cache stage, specified by its ` + "`" + `cache_stage_id` + "`" + `. Parameters which can be updated include the ` + "`" + `fallback_ttl` + "`" + ` and ` + "`" + `backend_stage_id` + "`" + `.`,
+		Long:      `Update the parameters of an existing cache stage, specified by its ` + "`" + `cache_stage_id` + "`" + `. Parameters which can be updated include the ` + "`" + `fallback_ttl` + "`" + `, ` + "`" + `include_cookies` + "`" + ` and ` + "`" + `backend_stage_id` + "`" + `.`,
 		Namespace: "edge-services",
 		Resource:  "cache-stage",
 		Verb:      "update",
@@ -1036,6 +1043,13 @@ func edgeServicesCacheStageUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "include-cookies",
+				Short:      `Defines whether responses to requests with cookies must be stored in the cache`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "backend-stage-id",
 				Short:      `Backend stage ID the cache stage will be linked to`,
diff --git a/internal/namespaces/interlink/v1beta1/interlink_cli.go b/internal/namespaces/interlink/v1beta1/interlink_cli.go
@@ -587,6 +587,13 @@ func interlinkLinkCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "vlan",
+				Short:      `For self-hosted links only, it is possible to choose the VLAN ID. If the VLAN is not available (ie already taken or out of range), an error is returned.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
diff --git a/internal/namespaces/ipam/v1/ipam_cli.go b/internal/namespaces/ipam/v1/ipam_cli.go
@@ -340,6 +340,10 @@ func ipamIPList() *core.Command {
 					"updated_at_asc",
 					"attached_at_desc",
 					"attached_at_asc",
+					"ip_address_desc",
+					"ip_address_asc",
+					"mac_address_desc",
+					"mac_address_asc",
 				},
 			},
 			{
