Merge branch 'master' into v1.7326.0

Author: jremy42

cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden

@@ -6,18 +6,19 @@ USAGE:
   scw apple-silicon server create [arg=value ...]
 
 ARGS:
-  [name=<generated>]                Create a server with this given name
-  [project-id]                      Project ID to use. If none is passed the default project ID will be used
-  [type]                            Create a server of the given type
-  [os-id]                           Create a server with the given os_id
-  [enable-vpc]                      Activate the Private Network feature for this server
-  [commitment-type]                 Activate commitment for this server (duration_24h | renewed_monthly | none)
-  [public-bandwidth-bps]            Public bandwidth to configure for this server. Expressed in bits per second.
-  [runner-configuration.name]       
-  [runner-configuration.url]        
-  [runner-configuration.token]      
-  [runner-configuration.provider]    (unknown_provider | github | gitlab)
-  [zone=fr-par-1]                   Zone to target. If none is passed will use default zone from the config (fr-par-3)
+  [name=<generated>]                                                 Create a server with this given name
+  [project-id]                                                       Project ID to use. If none is passed the default project ID will be used
+  [type]                                                             Create a server of the given type
+  [os-id]                                                            Create a server with the given os_id
+  [enable-vpc]                                                       Activate the Private Network feature for this server
+  [commitment-type]                                                  Activate commitment for this server (duration_24h | renewed_monthly | none)
+  [public-bandwidth-bps]                                             Public bandwidth to configure for this server. Expressed in bits per second.
+  [runner-configuration.name]                                        
+  [runner-configuration.url]                                         
+  [runner-configuration.token]                                       
+  [runner-configuration.provider]                                     (unknown_provider | github | gitlab)
+  [applied-runner-configurations.runner-configuration-ids.{index}]   
+  [zone=fr-par-1]                                                    Zone to target. If none is passed will use default zone from the config (fr-par-3)
 
 FLAGS:
   -h, --help   help for create

cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden

@@ -6,13 +6,14 @@ USAGE:
   scw apple-silicon server update <server-id ...> [arg=value ...]
 
 ARGS:
-  server-id                           UUID of the server you want to update
-  [name]                              Updated name for your server
-  [schedule-deletion]                 Specify whether the server should be flagged for automatic deletion
-  [enable-vpc]                        Activate or deactivate Private Network support for this server
-  [commitment-type.commitment-type]    (duration_24h | renewed_monthly | none)
-  [public-bandwidth-bps]              Public bandwidth configured for this server
-  [zone=fr-par-1]                     Zone to target. If none is passed will use default zone from the config (fr-par-3)
+  server-id                                                          UUID of the server you want to update
+  [name]                                                             Updated name for your server
+  [schedule-deletion]                                                Specify whether the server should be flagged for automatic deletion
+  [enable-vpc]                                                       Activate or deactivate Private Network support for this server
+  [commitment-type.commitment-type]                                   (duration_24h | renewed_monthly | none)
+  [public-bandwidth-bps]                                             Public bandwidth configured for this server
+  [applied-runner-configurations.runner-configuration-ids.{index}]   
+  [zone=fr-par-1]                                                    Zone to target. If none is passed will use default zone from the config (fr-par-3)
 
 FLAGS:
   -h, --help   help for update

docs/commands/apple-silicon.md

@@ -201,6 +201,7 @@ scw apple-silicon server create [arg=value ...]
 | runner-configuration.url |  |  |
 | runner-configuration.token |  |  |
 | runner-configuration.provider | One of: `unknown_provider`, `github`, `gitlab` |  |
+| applied-runner-configurations.runner-configuration-ids.{index} |  |  |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config |
 
 
@@ -352,6 +353,7 @@ scw apple-silicon server update <server-id ...> [arg=value ...]
 | enable-vpc |  | Activate or deactivate Private Network support for this server |
 | commitment-type.commitment-type | One of: `duration_24h`, `renewed_monthly`, `none` |  |
 | public-bandwidth-bps |  | Public bandwidth configured for this server |
+| applied-runner-configurations.runner-configuration-ids.{index} |  |  |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config |
 
 

go.mod

@@ -3,7 +3,7 @@ module github.com/scaleway/scaleway-cli/v2
 go 1.25.0
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.39.6
+	github.com/aws/aws-sdk-go-v2 v1.40.0
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.90.2
 	github.com/buildpacks/pack v0.38.2
 	github.com/c-bata/go-prompt v0.2.6

go.sum

@@ -63,8 +63,8 @@ github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3st
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go-v2 v1.39.6 h1:2JrPCVgWJm7bm83BDwY5z8ietmeJUbh3O2ACnn+Xsqk=
-github.com/aws/aws-sdk-go-v2 v1.39.6/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
+github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
+github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3/go.mod h1:xdCzcZEtnSTKVDOmUZs4l/j3pSV6rpo1WXl5ugNsL8Y=
 github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo=

internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go

@@ -232,6 +232,12 @@ func appleSiliconServerCreate() *core.Command {
 					"gitlab",
 				},
 			},
+			{
+				Name:       "applied-runner-configurations.runner-configuration-ids.{index}",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(scw.ZoneFrPar3),
 		},
 		Run: func(ctx context.Context, args any) (i any, e error) {
@@ -470,6 +476,12 @@ func appleSiliconServerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "applied-runner-configurations.runner-configuration-ids.{index}",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(scw.ZoneFrPar3),
 		},
 		Run: func(ctx context.Context, args any) (i any, e error) {