feat(instance): move EncryptedRdpPassword elements to Server (#3843)

Author: scaleway-bot

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

@@ -22,26 +22,27 @@ EXAMPLES:
     scw instance server server update 11111111-1111-1111-1111-111111111111 placement-group-id=11111111-1111-1111-1111-111111111111
 
 ARGS:
-  server-id                       UUID of the Instance
-  [name]                          Name of the Instance
-  [ip]                            IP that should be attached to the server (use ip=none to detach)
-  [cloud-init]                    The cloud-init script to use (Support file loading with @/path/to/file)
-  [boot-type]                      (local | bootscript | rescue)
-  [tags.{index}]                  Tags of the Instance
-  [volumes.{key}.boot=false]      Force the Instance to boot on this volume
-  [volumes.{key}.base-snapshot]   ID of the snapshot on which this volume will be based
-  [volumes.{key}.project]         Project ID of the volume
-  [volumes.{key}.organization]    Organization ID of the volume
-  [dynamic-ip-required]           
-  [routed-ip-enabled]             True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False)
-  [public-ips.{index}]            A list of reserved IP IDs to attach to the Instance
-  [protected]                     
-  [security-group-id]             
-  [volume-ids.{index}]            Will update ALL volume IDs at once, including the root volume of the server (use volume-ids=none to detach all volumes)
-  [placement-group-id]            Placement group ID if Instance must be part of a placement group
-  [private-nics.{index}]          Instance private NICs
-  [commercial-type]               Set the commercial_type for this Instance.
-  [zone=fr-par-1]                 Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
+  server-id                                UUID of the Instance
+  [name]                                   Name of the Instance
+  [ip]                                     IP that should be attached to the server (use ip=none to detach)
+  [cloud-init]                             The cloud-init script to use (Support file loading with @/path/to/file)
+  [boot-type]                               (local | bootscript | rescue)
+  [tags.{index}]                           Tags of the Instance
+  [volumes.{key}.boot=false]               Force the Instance to boot on this volume
+  [volumes.{key}.base-snapshot]            ID of the snapshot on which this volume will be based
+  [volumes.{key}.project]                  Project ID of the volume
+  [volumes.{key}.organization]             Organization ID of the volume
+  [dynamic-ip-required]                    
+  [routed-ip-enabled]                      True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False)
+  [public-ips.{index}]                     A list of reserved IP IDs to attach to the Instance
+  [protected]                              
+  [security-group-id]                      
+  [volume-ids.{index}]                     Will update ALL volume IDs at once, including the root volume of the server (use volume-ids=none to detach all volumes)
+  [placement-group-id]                     Placement group ID if Instance must be part of a placement group
+  [private-nics.{index}]                   Instance private NICs
+  [commercial-type]                        Set the commercial_type for this Instance.
+  [admin-password-encryption-ssh-key-id]   UUID of the SSH RSA key that will be used to encrypt the initial admin password for OS requiring it. Mandatory for Windows OS.
+  [zone=fr-par-1]                          Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 DEPRECATED ARGS:
   [bootscript]    

docs/commands/instance.md

@@ -2240,6 +2240,7 @@ scw instance server update <server-id ...> [arg=value ...]
 | placement-group-id |  | Placement group ID if Instance must be part of a placement group |
 | private-nics.{index} |  | Instance private NICs |
 | commercial-type |  | Set the commercial_type for this Instance. |
+| admin-password-encryption-ssh-key-id |  | UUID of the SSH RSA key that will be used to encrypt the initial admin password for OS requiring it. Mandatory for Windows OS. |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 

internal/namespaces/instance/v1/instance_cli.go

@@ -720,6 +720,13 @@ func instanceServerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "admin-password-encryption-ssh-key-id",
+				Short:      `UUID of the SSH RSA key that will be used to encrypt the initial admin password for OS requiring it. Mandatory for Windows OS.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {