chore: bump scaleway sdk-go (#3437)

Author: Codelax

go.mod

@@ -24,7 +24,7 @@ require (
 github.com/moby/buildkit v0.11.6
 github.com/opencontainers/go-digest v1.0.0
 github.com/pkg/errors v0.9.1
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231013121452-68e8fa55d026
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231016143828-0e00839bc858
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 github.com/spf13/cobra v1.7.0
 github.com/spf13/pflag v1.0.5

go.sum

@@ -487,8 +487,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 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.21.0.20231013121452-68e8fa55d026 h1:FsMuPbeCxvPMR/oqn7hz/OjG1LjDkeL0iUCnNdpjmEA=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231013121452-68e8fa55d026/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231016143828-0e00839bc858 h1:mXPRDjvAAxrfb/fmOXduTTNaO6PoWs31OG3KORMQoT0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231016143828-0e00839bc858/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

internal/namespaces/instance/v1/custom_image_test.go

@@ -12,7 +12,7 @@ import (
 func Test_ImageCreate(t *testing.T) {
 t.Run("Create simple image", core.Test(&core.TestConfig{
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 core.ExecStoreBeforeCmd("Snapshot", `scw instance snapshot create volume-id={{ (index .Server.Volumes "0").ID }}`),
 ),
 Commands: GetCommands(),
@@ -72,7 +72,7 @@ func Test_ImageDelete(t *testing.T) {
 
 func createImage(metaKey string) core.BeforeFunc {
 return core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 core.ExecStoreBeforeCmd("Snapshot", `scw instance snapshot create volume-id={{ (index .Server.Volumes "0").ID }}`),
 core.ExecStoreBeforeCmd(metaKey, `scw instance image create snapshot-id={{ .Snapshot.Snapshot.ID }} arch=x86_64`),
 )

internal/namespaces/instance/v1/custom_privatenics_test.go

@@ -15,7 +15,7 @@ func Test_ListNICs(t *testing.T) {
 Commands: cmds,
 BeforeFunc: core.BeforeFuncCombine(
 createPN(),
-createServer("Server"),
+createServerBionic("Server"),
 createNIC(),
 ),
 Cmd: "scw instance private-nic list server-id={{ .Server.ID }}",
@@ -46,7 +46,7 @@ func Test_GetPrivateNIC(t *testing.T) {
 Commands: cmds,
 BeforeFunc: core.BeforeFuncCombine(
 createPN(),
-createServer("Server"),
+createServerBionic("Server"),
 createNIC(),
 ),
 Cmd: "scw instance private-nic get server-id={{ .Server.ID }} private-nic-id={{ .NIC.PrivateNic.MacAddress }}",

internal/namespaces/instance/v1/custom_server_create_test.go

@@ -23,11 +23,11 @@ func Test_CreateServer(t *testing.T) {
 t.Run("Simple", func(t *testing.T) {
 t.Run("Default", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-Cmd: "scw instance server create image=ubuntu_bionic stopped=true",
+Cmd: "scw instance server create image=ubuntu_jammy stopped=true",
 Check: core.TestCheckCombine(
 core.TestCheckGolden(),
 func(t *testing.T, ctx *core.CheckFuncCtx) {
-assert.Equal(t, "Ubuntu 18.04 Bionic Beaver", ctx.Result.(*instance.Server).Image.Name)
+assert.Equal(t, "Ubuntu 22.04 Jammy Jellyfish", ctx.Result.(*instance.Server).Image.Name)
 },
 core.TestCheckExitCode(0),
 ),

internal/namespaces/instance/v1/custom_server_ssh_test.go

@@ -10,7 +10,7 @@ func Test_ServerSSH(t *testing.T) {
 t.Run("Simple", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 startServer("Server"),
 ),
 Cmd: "scw instance server ssh {{ .Server.ID }}",
@@ -29,7 +29,7 @@ func Test_ServerSSH(t *testing.T) {
 t.Run("With-Exit-Code", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 startServer("Server"),
 ),
 Cmd: "scw instance server ssh {{ .Server.ID }}",
@@ -47,7 +47,7 @@ func Test_ServerSSH(t *testing.T) {
 
 t.Run("Stopped server", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Cmd: "scw instance server ssh {{ .Server.ID }}",
 Check: core.TestCheckCombine(
 core.TestCheckGolden(),

internal/namespaces/instance/v1/custom_server_test.go

@@ -16,7 +16,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 t.Run("simple block volume", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 createVolume("Volume", 10, instance.VolumeVolumeTypeBSSD),
 ),
 Cmd: "scw instance server attach-volume server-id={{ .Server.ID }} volume-id={{ .Volume.ID }}",
@@ -33,7 +33,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 t.Run("simple local volume", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 createVolume("Volume", 10, instance.VolumeVolumeTypeLSSD),
 ),
 Cmd: "scw instance server attach-volume server-id={{ .Server.ID }} volume-id={{ .Volume.ID }}",
@@ -49,7 +49,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 
 t.Run("invalid volume UUID", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Cmd: "scw instance server attach-volume server-id={{ .Server.ID }} volume-id=11111111-1111-1111-1111-111111111111",
 Check: core.TestCheckCombine(
 core.TestCheckGolden(),
@@ -79,7 +79,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 
 t.Run("invalid volume UUID", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Cmd: "scw instance server detach-volume volume-id=11111111-1111-1111-1111-111111111111",
 Check: core.TestCheckCombine(
 core.TestCheckGolden(),
@@ -95,7 +95,7 @@ func Test_ServerUpdateCustom(t *testing.T) {
 // IP cases.
 t.Run("Try to remove ip from server without ip", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Cmd: "scw instance server update {{ .Server.ID }} ip=none",
 Check: core.TestCheckCombine(
 func(t *testing.T, ctx *core.CheckFuncCtx) {
@@ -109,7 +109,7 @@ func Test_ServerUpdateCustom(t *testing.T) {
 t.Run("Update server ip from server without ip", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 createIP("IP"),
 ),
 Cmd: "scw instance server update {{ .Server.ID }} ip={{ .IP.Address }}",
@@ -125,7 +125,7 @@ func Test_ServerUpdateCustom(t *testing.T) {
 t.Run("Update server ip from server with ip", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 createIP("IP1"),
 createIP("IP2"),
 
@@ -205,7 +205,7 @@ func Test_ServerUpdateCustom(t *testing.T) {
 t.Run("valid simple block volume", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 createVolume("Volume", 10, instance.VolumeVolumeTypeBSSD),
 ),
 Cmd: `scw instance server update {{ .Server.ID }} volume-ids.0={{ (index .Server.Volumes "0").ID }} volume-ids.1={{ .Volume.ID }}`,

internal/namespaces/instance/v1/custom_ssh_config_test.go

@@ -16,7 +16,7 @@ func Test_SSHConfigInstall(t *testing.T) {
 t.Run("Install config and create default", core.Test(&core.TestConfig{
 TmpHomeDir: true,
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Args: []string{"scw", "instance", "ssh", "install-config"},
 Check: core.TestCheckCombine(
 core.TestCheckGoldenAndReplacePatterns(
@@ -56,7 +56,7 @@ func Test_SSHConfigInstall(t *testing.T) {
 
 return nil
 },
-createServer("Server"),
+createServerBionic("Server"),
 ),
 Args: []string{"scw", "instance", "ssh", "install-config"},
 Check: core.TestCheckCombine(

internal/namespaces/instance/v1/custom_ssh_key_test.go

@@ -37,7 +37,7 @@ func Test_SSHKey(t *testing.T) {
 
 t.Run("Add key", core.Test(&core.TestConfig{
 Commands: GetCommands(),
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Args: []string{"scw", "instance", "ssh", "add-key", "server-id={{.Server.ID}}", "public-key=" + sshKey},
 Check: core.TestCheckCombine(
 core.TestCheckGolden(),
@@ -57,7 +57,7 @@ func Test_SSHKey(t *testing.T) {
 t.Run("List keys", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 addSSHKey("Server", sshKey),
 addSSHKey("Server", sshKey2),
 ),
@@ -76,7 +76,7 @@ func Test_SSHKey(t *testing.T) {
 t.Run("Remove key", core.Test(&core.TestConfig{
 Commands: GetCommands(),
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 addSSHKey("Server", sshKey),
 addSSHKey("Server", sshKey2),
 ),

internal/namespaces/instance/v1/custom_user_data_test.go

@@ -10,7 +10,7 @@ import (
 func Test_UserDataGet(t *testing.T) {
 t.Run("Get an existing key", core.Test(&core.TestConfig{
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 core.ExecBeforeCmd("scw instance user-data set server-id={{.Server.ID}} key=happy content=true"),
 ),
 Commands: GetCommands(),
@@ -23,7 +23,7 @@ func Test_UserDataGet(t *testing.T) {
 }))
 
 t.Run("Get an nonexistent key", core.Test(&core.TestConfig{
-BeforeFunc: createServer("Server"),
+BeforeFunc: createServerBionic("Server"),
 Commands: GetCommands(),
 Cmd: "scw instance user-data get server-id={{.Server.ID}} key=happy",
 AfterFunc: deleteServer("Server"),
@@ -37,7 +37,7 @@ func Test_UserDataGet(t *testing.T) {
 func Test_UserDataList(t *testing.T) {
 t.Run("Simple", core.Test(&core.TestConfig{
 BeforeFunc: core.BeforeFuncCombine(
-createServer("Server"),
+createServerBionic("Server"),
 core.ExecBeforeCmd("scw instance user-data set server-id={{ .Server.ID }} key=foo content=bar"),
 core.ExecBeforeCmd("scw instance user-data set server-id={{ .Server.ID }} key=bar content=foo"),
 ),