Skip to content

Commit cadc3f4

Browse files
yfodilyfodil
authored
chore: bump sdk go (#4313)
1 parent 0992af6 commit cadc3f4

File tree

39 files changed

+29880
-26619
lines changed

39 files changed

+29880
-26619
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.20241125164945-94736bc9e407
29+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241127163859-b0d5bdbdf6d5
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
@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
466466
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
468468
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241125164945-94736bc9e407 h1:fKdvTL5Uf2Yz9HuTkXvEXWIdYiwQN5e6Rx5n/R/E/Vg=
470-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241125164945-94736bc9e407/go.mod h1:kAoejOVBg1E/aVAR6IwKWEmbLCEg2IXklzPAkxzAaXA=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241127163859-b0d5bdbdf6d5 h1:vjckEMqnikp+ZrFgnj2wLvz7FfFI0NyjDiWYJB6f+Ls=
470+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241127163859-b0d5bdbdf6d5/go.mod h1:kAoejOVBg1E/aVAR6IwKWEmbLCEg2IXklzPAkxzAaXA=
471471
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
472472
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
473473
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

‎internal/namespaces/instance/v1/custom_server.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,9 +877,13 @@ func serverDeleteCommand() *core.Command {
877877
if err != nil {
878878
logger.Debugf("cannot marshal human size %v", volume.Size)
879879
}
880+
volumeName := ""
881+
if volume.Name != nil {
882+
volumeName = *volume.Name
883+
}
880884
deletedVolumeMessages = append(deletedVolumeMessages, [2]string{
881885
index,
882-
fmt.Sprintf("successfully deleted volume %s (%s %s)", volume.Name, humanSize, volume.VolumeType),
886+
fmt.Sprintf("successfully deleted volume %s (%s %s)", volumeName, humanSize, volume.VolumeType),
883887
})
884888
}
885889

‎internal/namespaces/instance/v1/custom_server_action.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,11 @@ func serverTerminateCommand() *core.Command {
381381
return nil, err
382382
}
383383

384-
_, _ = interactive.Printf("successfully detached volume %s\n", volume.Name)
384+
volumeName := ""
385+
if volume.Name != nil {
386+
volumeName = *volume.Name
387+
}
388+
_, _ = interactive.Printf("successfully detached volume %s\n", volumeName)
385389
}
386390
}
387391

‎internal/namespaces/instance/v1/custom_server_create_test.go‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ func Test_CreateServer(t *testing.T) {
123123
func(t *testing.T, ctx *core.CheckFuncCtx) {
124124
t.Helper()
125125
assert.NotNil(t, ctx.Result)
126-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["0"].Size)
126+
size := ctx.Result.(*instanceSDK.Server).Volumes["0"].Size
127+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size), "Size of volume should be 20 GB")
127128
},
128129
core.TestCheckExitCode(0),
129130
),
@@ -142,7 +143,8 @@ func Test_CreateServer(t *testing.T) {
142143
func(t *testing.T, ctx *core.CheckFuncCtx) {
143144
t.Helper()
144145
assert.NotNil(t, ctx.Result)
145-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["0"].Size)
146+
size := ctx.Result.(*instanceSDK.Server).Volumes["0"].Size
147+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size), "Size of volume should be 20 GB")
146148
},
147149
),
148150
AfterFunc: core.AfterFuncCombine(
@@ -164,7 +166,8 @@ func Test_CreateServer(t *testing.T) {
164166
func(t *testing.T, ctx *core.CheckFuncCtx) {
165167
t.Helper()
166168
assert.NotNil(t, ctx.Result)
167-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["0"].Size)
169+
size := ctx.Result.(*instanceSDK.Server).Volumes["0"].Size
170+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size), "Size of volume should be 20 GB")
168171
},
169172
),
170173
AfterFunc: core.AfterFuncCombine(
@@ -181,8 +184,10 @@ func Test_CreateServer(t *testing.T) {
181184
func(t *testing.T, ctx *core.CheckFuncCtx) {
182185
t.Helper()
183186
assert.NotNil(t, ctx.Result)
184-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["0"].Size)
185-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["1"].Size)
187+
size0 := ctx.Result.(*instanceSDK.Server).Volumes["0"].Size
188+
size1 := ctx.Result.(*instanceSDK.Server).Volumes["1"].Size
189+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size0), "Size of volume should be 10 GB")
190+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size1), "Size of volume should be 10 GB")
186191
},
187192
core.TestCheckExitCode(0),
188193
),
@@ -201,8 +206,10 @@ func Test_CreateServer(t *testing.T) {
201206
func(t *testing.T, ctx *core.CheckFuncCtx) {
202207
t.Helper()
203208
assert.NotNil(t, ctx.Result)
204-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["0"].Size)
205-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["1"].Size)
209+
size0 := ctx.Result.(*instanceSDK.Server).Volumes["0"].Size
210+
size1 := ctx.Result.(*instanceSDK.Server).Volumes["1"].Size
211+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size0), "Size of volume should be 20 GB")
212+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size1), "Size of volume should be 20 GB")
206213
},
207214
),
208215
AfterFunc: core.AfterFuncCombine(
@@ -220,9 +227,12 @@ func Test_CreateServer(t *testing.T) {
220227
func(t *testing.T, ctx *core.CheckFuncCtx) {
221228
t.Helper()
222229
assert.NotNil(t, ctx.Result)
223-
assert.Equal(t, 1*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["1"].Size)
224-
assert.Equal(t, 5*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["2"].Size)
225-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.Server).Volumes["3"].Size)
230+
size1 := ctx.Result.(*instanceSDK.Server).Volumes["1"].Size
231+
size2 := ctx.Result.(*instanceSDK.Server).Volumes["2"].Size
232+
size3 := ctx.Result.(*instanceSDK.Server).Volumes["3"].Size
233+
assert.Equal(t, 1*scw.GB, instance.SizeValue(size1), "Size of volume should be 1 GB")
234+
assert.Equal(t, 5*scw.GB, instance.SizeValue(size2), "Size of volume should be 5 GB")
235+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size3), "Size of volume should be 10 GB")
226236
},
227237
),
228238
AfterFunc: deleteServerAfterFunc(),

‎internal/namespaces/instance/v1/custom_server_test.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ func Test_ServerVolumeUpdate(t *testing.T) {
2626
Check: func(t *testing.T, ctx *core.CheckFuncCtx) {
2727
t.Helper()
2828
require.NoError(t, ctx.Err)
29-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["0"].Size)
30-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].Size)
29+
size0 := ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["0"].Size
30+
size1 := ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].Size
31+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size0), "Size of volume should be 20 GB")
32+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size1), "Size of volume should be 10 GB")
3133
assert.Equal(t, instanceSDK.VolumeServerVolumeTypeBSSD, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].VolumeType)
3234
},
3335
AfterFunc: deleteServer("Server"),
@@ -44,8 +46,10 @@ func Test_ServerVolumeUpdate(t *testing.T) {
4446
Check: func(t *testing.T, ctx *core.CheckFuncCtx) {
4547
t.Helper()
4648
require.NoError(t, ctx.Err)
47-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["0"].Size)
48-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].Size)
49+
size0 := ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["0"].Size
50+
size1 := ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].Size
51+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size0), "Size of volume should be 20 GB")
52+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size1), "Size of volume should be 10 GB")
4953
assert.Equal(t, instanceSDK.VolumeServerVolumeTypeLSSD, ctx.Result.(*instanceSDK.AttachVolumeResponse).Server.Volumes["1"].VolumeType)
5054
},
5155
AfterFunc: deleteServer("Server"),
@@ -223,8 +227,10 @@ func Test_ServerUpdateCustom(t *testing.T) {
223227
Check: func(t *testing.T, ctx *core.CheckFuncCtx) {
224228
t.Helper()
225229
require.NoError(t, ctx.Err)
226-
assert.Equal(t, 20*scw.GB, ctx.Result.(*instanceSDK.UpdateServerResponse).Server.Volumes["0"].Size)
227-
assert.Equal(t, 10*scw.GB, ctx.Result.(*instanceSDK.UpdateServerResponse).Server.Volumes["1"].Size)
230+
size0 := ctx.Result.(*instanceSDK.UpdateServerResponse).Server.Volumes["0"].Size
231+
size1 := ctx.Result.(*instanceSDK.UpdateServerResponse).Server.Volumes["1"].Size
232+
assert.Equal(t, 20*scw.GB, instance.SizeValue(size0), "Size of volume should be 20 GB")
233+
assert.Equal(t, 10*scw.GB, instance.SizeValue(size1), "Size of volume should be 10 GB")
228234
},
229235
AfterFunc: deleteServer("Server"),
230236
}))

‎internal/namespaces/instance/v1/helpers_types.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@ func completeServerType(ctx context.Context, prefix string, createReq any) core.
3232
func commercialTypeIsWindowsServer(commercialType string) bool {
3333
return strings.HasSuffix(commercialType, "-WIN")
3434
}
35+
36+
func SizeValue(s *scw.Size) scw.Size {
37+
if s != nil {
38+
return *s
39+
}
40+
return 0
41+
}

0 commit comments

Comments
 (0)