Merge branch 'scaleway:master' into master

Author: scaleway-bot

.github/workflows/codeql-analysis.yml

@@ -48,7 +48,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

core/testing.go

@@ -312,6 +312,7 @@ var DefaultRetryInterval *time.Duration
 
 var foldersUsingVCRv4 = []string{
 	"instance",
+	"k8s",
 }
 
 func folderUsesVCRv4(fullFolderPath string) bool {

internal/namespaces/instance/v1/custom_image_test.go

@@ -171,7 +171,10 @@ func Test_ImageList(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteImage("Image"),
+		AfterFunc: core.AfterFuncCombine(
+			deleteImage("Image"),
+			deleteServer("Server"),
+		),
 	}))
 
 	t.Run("With SBS root volume", core.Test(&core.TestConfig{
@@ -185,7 +188,10 @@ func Test_ImageList(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteImage("ImageSBSRoot"),
+		AfterFunc: core.AfterFuncCombine(
+			deleteImage("ImageSBSRoot"),
+			deleteServer("Server"),
+		),
 	}))
 
 	t.Run("With SBS additional volumes", core.Test(&core.TestConfig{
@@ -199,7 +205,10 @@ func Test_ImageList(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteImage("ImageSBSAdditional"),
+		AfterFunc: core.AfterFuncCombine(
+			deleteImage("ImageSBSAdditional"),
+			deleteServer("Server"),
+		),
 	}))
 }
 

internal/namespaces/instance/v1/custom_privatenics_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
+	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
 )
 
 func Test_ListNICs(t *testing.T) {
@@ -15,14 +16,18 @@ func Test_ListNICs(t *testing.T) {
 	t.Run("Simple", core.Test(&core.TestConfig{
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
-			createPN(),
+			testhelpers.CreatePN(),
 			createServer("Server"),
 			createNIC(),
 		),
 		Cmd: "scw instance private-nic list server-id={{ .Server.ID }}",
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 		),
+		AfterFunc: core.AfterFuncCombine(
+			deleteServer("Server"),
+			testhelpers.DeletePN(),
+		),
 	}))
 }
 
@@ -33,26 +38,34 @@ func Test_GetPrivateNIC(t *testing.T) {
 	t.Run("Get from ID", core.Test(&core.TestConfig{
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
-			createPN(),
+			testhelpers.CreatePN(),
 			createServer("Server"),
 			createNIC(),
 		),
 		Cmd: "scw instance private-nic get server-id={{ .Server.ID }} private-nic-id={{ .NIC.PrivateNic.ID }}",
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 		),
+		AfterFunc: core.AfterFuncCombine(
+			deleteServer("Server"),
+			testhelpers.DeletePN(),
+		),
 	}))
 
 	t.Run("Get from MAC address", core.Test(&core.TestConfig{
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
-			createPN(),
+			testhelpers.CreatePN(),
 			createServer("Server"),
 			createNIC(),
 		),
 		Cmd: "scw instance private-nic get server-id={{ .Server.ID }} private-nic-id={{ .NIC.PrivateNic.MacAddress }}",
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 		),
+		AfterFunc: core.AfterFuncCombine(
+			deleteServer("Server"),
+			testhelpers.DeletePN(),
+		),
 	}))
 }

internal/namespaces/instance/v1/custom_server_action_test.go

@@ -166,7 +166,7 @@ func Test_ServerBackup(t *testing.T) {
 				"scw instance image delete {{ .CmdResult.Image.ID }} with-snapshots=true",
 			),
 			core.ExecAfterCmd(
-				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local",
+				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all",
 			),
 		),
 	}))
@@ -189,7 +189,7 @@ func Test_ServerBackup(t *testing.T) {
 				"scw instance image delete {{ .CmdResult.Image.ID }} with-snapshots=true",
 			),
 			core.ExecAfterCmd(
-				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local",
+				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all",
 			),
 		),
 	}))
@@ -224,7 +224,7 @@ func Test_ServerAction(t *testing.T) {
 		),
 		AfterFunc: core.AfterFuncCombine(
 			core.ExecAfterCmd(
-				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local force-shutdown=true",
+				"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all force-shutdown=true",
 			),
 		),
 	}))

internal/namespaces/instance/v1/custom_server_create_test.go

@@ -695,6 +695,7 @@ func Test_CreateServerErrors(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(1),
 		),
+		AfterFunc:       deleteVolume("Volume"),
 		DisableParallel: true,
 	}))
 

internal/namespaces/instance/v1/custom_server_rdp_test.go

@@ -147,7 +147,9 @@ func Test_ServerGetRdpPassword(t *testing.T) {
 			},
 		),
 		AfterFunc: core.AfterFuncCombine(
-			core.ExecAfterCmd("scw instance server terminate {{.Server.ID}}"),
+			core.ExecAfterCmd(
+				"scw instance server terminate {{.Server.ID}} with-ip=true with-block=true",
+			),
 			core.ExecAfterCmd("scw iam ssh-key delete {{.SSHKey.ID}}"),
 		),
 		TmpHomeDir: true,

internal/namespaces/instance/v1/custom_server_test.go

@@ -366,7 +366,7 @@ func Test_ServerDelete(t *testing.T) {
 		),
 		BeforeFunc: core.ExecStoreBeforeCmd(
 			"Server",
-			testServerCommand("stopped=true additional-volumes.0=block:10G"),
+			testServerCommand("stopped=true root-volume=l:20G additional-volumes.0=block:10G"),
 		),
 		Cmd: `scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local`,
 		Check: core.TestCheckCombine(

internal/namespaces/instance/v1/custom_user_data_test.go

@@ -83,21 +83,24 @@ func Test_UserDataFileUploadOn(t *testing.T) {
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 		),
-		AfterFunc: func(_ *core.AfterFuncCtx) error {
-			// We need to close this file explicitly because it is not closed by the os.Remove call on windows
-			// https://github.com/golang/go/issues/50510
-			err = file.Close()
-			if err != nil {
-				return err
-			}
+		AfterFunc: core.AfterFuncCombine(
+			func(_ *core.AfterFuncCtx) error {
+				// We need to close this file explicitly because it is not closed by the os.Remove call on windows
+				// https://github.com/golang/go/issues/50510
+				err = file.Close()
+				if err != nil {
+					return err
+				}
 
-			err = os.RemoveAll(file.Name())
-			if err != nil {
-				return err
-			}
+				err = os.RemoveAll(file.Name())
+				if err != nil {
+					return err
+				}
 
-			return nil
-		},
+				return nil
+			},
+			deleteServer("Server"),
+		),
 	}))
 }
 
@@ -126,20 +129,23 @@ func Test_UserDataFileUploadOnRandom(t *testing.T) {
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 		),
-		AfterFunc: func(_ *core.AfterFuncCtx) error {
-			// We need to close this file explicitly because it is not closed by the os.Remove call on windows
-			// https://github.com/golang/go/issues/50510
-			err = file.Close()
-			if err != nil {
-				return err
-			}
+		AfterFunc: core.AfterFuncCombine(
+			func(_ *core.AfterFuncCtx) error {
+				// We need to close this file explicitly because it is not closed by the os.Remove call on windows
+				// https://github.com/golang/go/issues/50510
+				err = file.Close()
+				if err != nil {
+					return err
+				}
 
-			err = os.RemoveAll(file.Name())
-			if err != nil {
-				return err
-			}
+				err = os.RemoveAll(file.Name())
+				if err != nil {
+					return err
+				}
 
-			return nil
-		},
+				return nil
+			},
+			deleteServer("Server"),
+		),
 	}))
 }

internal/namespaces/instance/v1/helpers_test.go

@@ -236,13 +236,6 @@ func deleteBlockSnapshot(metaKey string) core.AfterFunc {
 	return core.ExecAfterCmd("scw block snapshot delete {{ ." + metaKey + ".ID }}")
 }
 
-func createPN() core.BeforeFunc {
-	return core.ExecStoreBeforeCmd(
-		"PN",
-		"scw vpc private-network create",
-	)
-}
-
 func createNIC() core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
 		"NIC",