Skip to content

Commit 02c8e16

Browse files
scaleway-botremyleone
scaleway-bot
and
remyleone
authored
chore: update goldens to remove bootscripts (scaleway#4191)
Co-authored-by: Rémy Léone <[email protected]>
1 parent dc425c0 commit 02c8e16

9 files changed

+5
-95
lines changed

‎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.20241016074915-cfe16eadece2
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.20241016074915-cfe16eadece2 h1:RJiIfnp9Jh35YJswV5soHKu+pKFHJkrSJlX7zyobfI4=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016074915-cfe16eadece2/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/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": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ Image.Zone fr-par-1
2323
"creation_date": "1970-01-01T00:00:00.0Z",
2424
"modification_date": "1970-01-01T00:00:00.0Z",
2525
"default_bootscript": {
26+
"architecture": "x86_64",
2627
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
2728
"default": true,
2829
"dtb": "",
2930
"id": "fdfe150f-a870-4ce4-b432-9f56b5b995c1",
3031
"initrd": "http://10.194.3.9/initrd/initrd-Linux-x86_64-v3.14.6.gz",
3132
"kernel": "http://10.194.3.9/kernel/x86_64-mainline-lts-4.4-4.4.230-rev1/vmlinuz-4.4.230",
3233
"organization": "11111111-1111-4111-8111-111111111111",
33-
"project": "11111111-1111-4111-8111-111111111111",
3434
"public": true,
3535
"title": "x86_64 mainline 4.4.230 rev1",
36-
"architecture": "x86_64",
36+
"project": "11111111-1111-4111-8111-111111111111",
3737
"zone": "fr-par-1"
3838
},
3939
"extra_volumes": {},

‎internal/namespaces/instance/v1/testdata/test-server-enable-routed-ip-simple.golden‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ MacAddress de:00:00:12:5a:4b
5151
ModificationDate few seconds ago
5252
State running
5353
Location fr-par-3
54-
Bootscript x86_64 mainline 4.4.230 rev1
5554
BootType local
5655
Volumes.0.ID 8c935774-18e4-4747-8765-820399eaaab8
5756
Volumes.0.Name Ubuntu 22.04 Jammy Jellyfish
@@ -152,20 +151,6 @@ Zone fr-par-3
152151
"zone_id": "fr-par-3"
153152
},
154153
"ipv6": null,
155-
"bootscript": {
156-
"bootcmdargs": "LINUX_COMMON scaleway boot=local nbd.max_part=16",
157-
"default": true,
158-
"dtb": "",
159-
"id": "346edd9d-a17a-45f5-b2ac-bbf282c3ce3c",
160-
"initrd": "http://169.254.42.24/initrd/initrd-Linux-x86_64-v3.14.6.gz",
161-
"kernel": "http://169.254.42.24/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-3"
168-
},
169154
"boot_type": "local",
170155
"volumes": {
171156
"0": {

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

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

0 commit comments

Comments
 (0)