Skip to content

Commit 81094ac

Browse files
committed
feat: update generated APIs
1 parent ef739f3 commit 81094ac

13 files changed

+5
-112
lines changed

cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ ARGS:
2525
[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)
2626

2727
DEPRECATED ARGS:
28-
[default-bootscript] Default bootscript of the image
2928
[additional-volumes.{index}.organization-id] Organization ID that own the additional snapshot
3029

3130
FLAGS:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ ARGS:
4444
[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)
4545

4646
DEPRECATED ARGS:
47-
[bootscript]
4847
[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)
4948
[enable-ipv6]
5049

docs/commands/instance.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ scw instance image create [arg=value ...]
134134
| name | Default: `<generated>` | Name of the image |
135135
| snapshot-id | Required | UUID of the snapshot that will be used as root volume in the image |
136136
| arch | Required<br />One of: `unknown_arch`, `x86_64`, `arm`, `arm64` | Architecture of the image |
137-
| ~~default-bootscript~~ | Deprecated | Default bootscript of the image |
138137
| additional-volumes.{index}.id | | UUID of the snapshot to add |
139138
| additional-volumes.{index}.name | | Name of the additional snapshot |
140139
| additional-volumes.{index}.size | | Size of the additional snapshot |
@@ -2271,7 +2270,6 @@ scw instance server update <server-id ...> [arg=value ...]
22712270
| volumes.{key}.base-snapshot | | ID of the snapshot on which this volume will be based |
22722271
| volumes.{key}.project | | Project ID of the volume |
22732272
| volumes.{key}.organization | | Organization ID of the volume |
2274-
| ~~bootscript~~ | Deprecated | |
22752273
| dynamic-ip-required | | |
22762274
| ~~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) |
22772275
| public-ips.{index} | | A list of reserved IP IDs to attach to the Instance |

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/mattn/go-isatty v0.0.20
2727
github.com/moby/buildkit v0.13.2
2828
github.com/opencontainers/go-digest v1.0.0
29-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092
29+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0
3030
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
3131
github.com/spf13/cobra v1.8.1
3232
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
465465
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
466466
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
468-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092 h1:ZGeS/9T7KyEpAFpalrS2PZR6zxIOV316VTyqGF4/8EQ=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241009082205-3d425c15e092/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
468+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0 h1:bykODWS911XOzQZ+WfJ2NmWmFcB0Iuod5+brNIUeNqE=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016121547-71e46305b9a0/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
470470
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
471471
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
472472
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/instance/v1/instance_cli.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,6 @@ func instanceServerUpdate() *core.Command {
651651
Deprecated: false,
652652
Positional: false,
653653
},
654-
{
655-
Name: "bootscript",
656-
Required: false,
657-
Deprecated: true,
658-
Positional: false,
659-
},
660654
{
661655
Name: "dynamic-ip-required",
662656
Required: false,
@@ -1117,13 +1111,6 @@ func instanceImageCreate() *core.Command {
11171111
Positional: false,
11181112
EnumValues: []string{"unknown_arch", "x86_64", "arm", "arm64"},
11191113
},
1120-
{
1121-
Name: "default-bootscript",
1122-
Short: `Default bootscript of the image`,
1123-
Required: false,
1124-
Deprecated: true,
1125-
Positional: false,
1126-
},
11271114
{
11281115
Name: "extra-volumes.{key}.id",
11291116
Short: `UUID of the volume`,

internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ PublicIPs.0.State attached
4747
MacAddress de:00:00:40:b0:af
4848
ModificationDate few seconds ago
4949
State archived
50-
Bootscript x86_64 mainline 4.4.230 rev1
5150
BootType local
5251
Volumes.0.ID 08424d6f-cf09-4498-94b5-042ef6eb38f1
5352
Volumes.0.Name Ubuntu Jammy GPU OS 12 passthrough
@@ -152,20 +151,6 @@ Zone fr-par-2
152151
"state": "stopped",
153152
"location": null,
154153
"ipv6": null,
155-
"bootscript": {
156-
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
157-
"default": true,
158-
"dtb": "",
159-
"id": "e6a56379-9ef4-48d4-a1d2-12b475e0fed8",
160-
"initrd": "http://10.197.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz",
161-
"kernel": "http://10.197.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230",
162-
"organization": "11111111-1111-4111-8111-111111111111",
163-
"project": "11111111-1111-4111-8111-111111111111",
164-
"public": true,
165-
"title": "x86_64 mainline 4.4.230 rev1",
166-
"architecture": "x86_64",
167-
"zone": "fr-par-2"
168-
},
169154
"boot_type": "local",
170155
"volumes": {
171156
"0": {

internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ PublicIPs.0.State attached
4747
MacAddress de:00:00:5f:a1:a7
4848
ModificationDate few seconds ago
4949
State archived
50-
Bootscript x86_64 mainline 4.4.230 rev1
5150
BootType local
5251
Volumes.0.ID b2a541e6-cd3a-418d-9cb2-c3e10ae4b3f3
5352
Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish
@@ -139,20 +138,6 @@ Zone fr-par-1
139138
"state": "stopped",
140139
"location": null,
141140
"ipv6": null,
142-
"bootscript": {
143-
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
144-
"default": true,
145-
"dtb": "",
146-
"id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1",
147-
"initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz",
148-
"kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230",
149-
"organization": "11111111-1111-4111-8111-111111111111",
150-
"project": "11111111-1111-4111-8111-111111111111",
151-
"public": true,
152-
"title": "x86_64 mainline 4.4.230 rev1",
153-
"architecture": "x86_64",
154-
"zone": "fr-par-1"
155-
},
156141
"boot_type": "local",
157142
"volumes": {
158143
"0": {

internal/namespaces/instance/v1/testdata/test-get-server-simple.golden

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ PublicIP.State attached
2323
MacAddress de:00:00:5f:a2:f1
2424
ModificationDate few seconds ago
2525
State archived
26-
Bootscript x86_64 mainline 4.4.230 rev1
2726
BootType local
2827
SecurityGroup.ID 0fe819c3-274d-472a-b3f5-ddb258d2d8bb
2928
SecurityGroup.Name Default security group
@@ -134,20 +133,6 @@ ID MAC ADDRESS PRIVATE NETWORK NAME PRIVATE NETWORK ID
134133
"state": "stopped",
135134
"location": null,
136135
"ipv6": null,
137-
"bootscript": {
138-
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
139-
"default": true,
140-
"dtb": "",
141-
"id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1",
142-
"initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz",
143-
"kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230",
144-
"organization": "11111111-1111-4111-8111-111111111111",
145-
"project": "11111111-1111-4111-8111-111111111111",
146-
"public": true,
147-
"title": "x86_64 mainline 4.4.230 rev1",
148-
"architecture": "x86_64",
149-
"zone": "fr-par-1"
150-
},
151136
"boot_type": "local",
152137
"volumes": {
153138
"0": {

internal/namespaces/instance/v1/testdata/test-server-action-manual-poweron.golden

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ MacAddress de:00:00:5f:a1:03
5151
ModificationDate few seconds ago
5252
State running
5353
Location fr-par-1
54-
Bootscript x86_64 mainline 4.4.230 rev1
5554
BootType local
5655
Volumes.0.ID 2c0392b4-a294-46d8-a393-39f4bfacf77f
5756
Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish
@@ -152,20 +151,6 @@ Zone fr-par-1
152151
"zone_id": "par1"
153152
},
154153
"ipv6": null,
155-
"bootscript": {
156-
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
157-
"default": true,
158-
"dtb": "",
159-
"id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1",
160-
"initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz",
161-
"kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230",
162-
"organization": "11111111-1111-4111-8111-111111111111",
163-
"project": "11111111-1111-4111-8111-111111111111",
164-
"public": true,
165-
"title": "x86_64 mainline 4.4.230 rev1",
166-
"architecture": "x86_64",
167-
"zone": "fr-par-1"
168-
},
169154
"boot_type": "local",
170155
"volumes": {
171156
"0": {

0 commit comments

Comments
 (0)