Merge branch 'master' into v1.6358.0

yfodil · web-flow · commit bb4227eb01b7 · 2025-04-08T15:49:43.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden b/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden
@@ -34,7 +34,7 @@ ARGS:
   [volumes.{key}.organization]             Organization ID of the volume
   [dynamic-ip-required]                    
   [public-ips.{index}]                     A list of reserved IP IDs to attach to the Instance
-  [protected]                              
+  [protected]                              True to activate server protection option
   [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
diff --git a/docs/commands/instance.md b/docs/commands/instance.md
@@ -2301,7 +2301,7 @@ scw instance server update <server-id ...> [arg=value ...]
 | ~~routed-ip-enabled~~ | Deprecated | 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 |
 | ~~enable-ipv6~~ | Deprecated |  |
-| protected |  |  |
+| protected |  | True to activate server protection option |
 | 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 |
diff --git a/go.mod b/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.20250402123125-11d6084394b9
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
@@ -462,8 +462,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.20250402123125-11d6084394b9 h1:VNBzqf91PUmi+HTyp6+7Uxdq/A1b7eWouokHZiZxt0E=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250402123125-11d6084394b9/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef h1:e0aETjcCykw59oyfal17KonPnJjnIsYKt4y9GHrwYjM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef/go.mod h1:ILAZV9jmsf+YmJ8UGNpZ9rUnKtHs5EqnBFv47qqYcaU=
 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=
diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go
@@ -675,6 +675,7 @@ func instanceServerUpdate() *core.Command {
 			},
 			{
 				Name:       "protected",
+				Short:      `True to activate server protection option`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden b/internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden
@@ -70,6 +70,7 @@ SecurityGroup.Name            Default security group
 StateDetail                   -
 Arch                          x86_64
 Zone                          fr-par-2
+EndOfService                  false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "id": "9851b09c-1c2b-4fef-bc06-7ce31ff3188a",
@@ -189,5 +190,6 @@ Zone                          fr-par-2
   "private_nics": [],
   "zone": "fr-par-2",
   "admin_password_encryption_ssh_key_id": null,
-  "admin_password_encrypted_value": null
+  "admin_password_encrypted_value": null,
+  "end_of_service": false
 }
diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden b/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden
@@ -39,6 +39,7 @@ SecurityGroup.Name      Default security group
 StateDetail             -
 Arch                    x86_64
 Zone                    fr-par-1
+EndOfService            false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "id": "cf1cfe02-38f9-4fce-bc1c-ab61925cff05",
@@ -116,5 +117,6 @@ Zone                    fr-par-1
   "private_nics": [],
   "zone": "fr-par-1",
   "admin_password_encryption_ssh_key_id": null,
-  "admin_password_encrypted_value": null
+  "admin_password_encrypted_value": null,
+  "end_of_service": false
 }
diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden b/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden
@@ -20,6 +20,7 @@ SecurityGroup.Name  Default security group
 StateDetail         -
 Arch                x86_64
 Zone                fr-par-1
+EndOfService        false
 
 Server Image:
 ID                63d40353-5519-46d0-9172-ccf4885954e1
@@ -128,6 +129,7 @@ ID   MAC ADDRESS  PRIVATE NETWORK NAME  PRIVATE NETWORK ID
   "zone": "fr-par-1",
   "admin_password_encryption_ssh_key_id": null,
   "admin_password_encrypted_value": null,
+  "end_of_service": false,
   "Volumes": [
     {
       "id": "7b8f71d4-d089-4ba4-a713-6916e7d91c6c",
diff --git a/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden b/internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden
@@ -43,6 +43,7 @@ SecurityGroup.Name      Default security group
 StateDetail             booting kernel
 Arch                    x86_64
 Zone                    fr-par-1
+EndOfService            false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "id": "5c79fa34-9760-4cf7-94a8-ae28003c2353",
@@ -129,5 +130,6 @@ Zone                    fr-par-1
   "private_nics": [],
   "zone": "fr-par-1",
   "admin_password_encryption_ssh_key_id": null,
-  "admin_password_encrypted_value": null
+  "admin_password_encrypted_value": null,
+  "end_of_service": false
 }
diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden b/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden
@@ -39,6 +39,7 @@ Server.SecurityGroup.Name      Default security group
 Server.StateDetail             -
 Server.Arch                    x86_64
 Server.Zone                    fr-par-1
+Server.EndOfService            false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "server": {
@@ -117,6 +118,7 @@ Server.Zone                    fr-par-1
     "private_nics": [],
     "zone": "fr-par-1",
     "admin_password_encryption_ssh_key_id": null,
-    "admin_password_encrypted_value": null
+    "admin_password_encrypted_value": null,
+    "end_of_service": false
   }
 }
diff --git a/internal/namespaces/vpc/v2/vpc_cli.go b/internal/namespaces/vpc/v2/vpc_cli.go
@@ -131,7 +131,7 @@ func vpcVpcList() *core.Command {
 			},
 			{
 				Name:       "tags.{index}",
-				Short:      `Tags to filter for. Only VPCs with one more more matching tags will be returned`,
+				Short:      `Tags to filter for. Only VPCs with one or more matching tags will be returned`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
diff --git a/internal/namespaces/vpcgw/v1/vpcgw_cli.go b/internal/namespaces/vpcgw/v1/vpcgw_cli.go

Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ func instanceServerUpdate() *core.Command {`
`675`	`675`	`},`
`676`	`676`	`{`
`677`	`677`	`Name: "protected",`
	`678`	+ Short: `True to activate server protection option`,
`678`	`679`	`Required: false,`
`679`	`680`	`Deprecated: false,`
`680`	`681`	`Positional: false,`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ Server.SecurityGroup.Name Default security group`
`39`	`39`	`Server.StateDetail -`
`40`	`40`	`Server.Arch x86_64`
`41`	`41`	`Server.Zone fr-par-1`
	`42`	`+Server.EndOfService false`
`42`	`43`	`🟩🟩🟩 JSON STDOUT 🟩🟩🟩`
`43`	`44`	`{`
`44`	`45`	`"server": {`
`@@ -117,6 +118,7 @@ Server.Zone fr-par-1`
`117`	`118`	`"private_nics": [],`
`118`	`119`	`"zone": "fr-par-1",`
`119`	`120`	`"admin_password_encryption_ssh_key_id": null,`
`120`		`- "admin_password_encrypted_value": null`
	`121`	`+ "admin_password_encrypted_value": null,`
	`122`	`+ "end_of_service": false`
`121`	`123`	`}`
`122`	`124`	`}`