feat(instance): handle sbs volumes in server backup

internal/namespaces/instance/v1/custom_image.go

@@ -5,11 +5,13 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
+	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -246,6 +248,7 @@ func imageDeleteBuilder(c *core.Command) *core.Command {
 		args := argsI.(*customDeleteImageRequest)
 
 		api := instance.NewAPI(core.ExtractClient(ctx))
+		blockAPI := block.NewAPI(core.ExtractClient(ctx))
 
 		// If we want to delete snapshot we must GET image before we delete it
 		image := (*instance.Image)(nil)
@@ -266,21 +269,49 @@ func imageDeleteBuilder(c *core.Command) *core.Command {
 			return nil, err
 		}
 
+		type UnknownSnapshot struct {
+			ID   string
+			Type instance.VolumeVolumeType
+		}
+
 		// Once the image is deleted we can delete snapshots.
 		if args.WithSnapshots {
-			snapshotIDs := []string{
-				image.RootVolume.ID,
+			snapshots := []UnknownSnapshot{
+				{
+					ID:   image.RootVolume.ID,
+					Type: image.RootVolume.VolumeType,
+				},
 			}
-			for _, snapshot := range image.ExtraVolumes {
-				snapshotIDs = append(snapshotIDs, snapshot.ID)
-			}
-			for _, snapshotID := range snapshotIDs {
-				err := api.DeleteSnapshot(&instance.DeleteSnapshotRequest{
-					Zone:       args.Zone,
-					SnapshotID: snapshotID,
+			for _, extraVolume := range image.ExtraVolumes {
+				snapshots = append(snapshots, UnknownSnapshot{
+					ID:   extraVolume.ID,
+					Type: extraVolume.VolumeType,
 				})
-				if err != nil {
-					return nil, err
+			}
+			for _, snapshot := range snapshots {
+				if strings.HasPrefix(string(snapshot.Type), "sbs") {
+					_, err := blockAPI.WaitForSnapshot(&block.WaitForSnapshotRequest{
+						SnapshotID: snapshot.ID,
+						Zone:       args.Zone,
+					})
+					if err != nil {
+						return nil, err
+					}
+					err = blockAPI.DeleteSnapshot(&block.DeleteSnapshotRequest{
+						Zone:       args.Zone,
+						SnapshotID: snapshot.ID,
+					})
+					if err != nil {
+						return nil, err
+					}
+				} else {
+					err := api.DeleteSnapshot(&instance.DeleteSnapshotRequest{
+						Zone:       args.Zone,
+						SnapshotID: snapshot.ID,
+					})
+					if err != nil {
+						return nil, err
+					}
 				}
 			}
 		}

internal/namespaces/instance/v1/custom_server_action.go

@@ -177,8 +177,14 @@ Once your image is ready you will be able to create a new server based on this i
 						VolumeType: instance.SnapshotVolumeTypeUnified,
 					}
 				} else {
-					template = &instance.ServerActionRequestVolumeBackupTemplate{
-						VolumeType: instance.SnapshotVolumeType(v.VolumeType),
+					if v.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
+						template = &instance.ServerActionRequestVolumeBackupTemplate{
+							VolumeType: instance.SnapshotVolumeType("sbs_snapshot"),
+						}
+					} else {
+						template = &instance.ServerActionRequestVolumeBackupTemplate{
+							VolumeType: instance.SnapshotVolumeType(v.VolumeType),
+						}
 					}
 				}
 				req.Volumes[v.ID] = template

internal/namespaces/instance/v1/custom_server_action_test.go

@@ -114,6 +114,20 @@ func Test_ServerBackup(t *testing.T) {
 			core.ExecAfterCmd("scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local"),
 		),
 	}))
+
+	t.Run("With SBS volumes", core.Test(&core.TestConfig{
+		Commands:   instance.GetCommands(),
+		BeforeFunc: core.ExecStoreBeforeCmd("Server", testServerCommand("root-volume=sbs:20G stopped=true image=ubuntu-jammy")),
+		Cmd:        `scw instance server backup {{ .Server.ID }} name=backup`,
+		Check: core.TestCheckCombine(
+			core.TestCheckGolden(),
+			core.TestCheckExitCode(0),
+		),
+		AfterFunc: core.AfterFuncCombine(
+			core.ExecAfterCmd("scw instance image delete {{ .CmdResult.Image.ID }} with-snapshots=true"),
+			core.ExecAfterCmd("scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local"),
+		),
+	}))
 }
 
 func Test_ServerAction(t *testing.T) {