fix default volumes to start at 1 and add test

Author: Codelax

internal/namespaces/instance/v1/custom_server_create.go

@@ -291,10 +291,6 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
 			return nil, err
 		}
 
-		if serverType != nil {
-			volumes = addDefaultVolumes(serverType, volumes)
-		}
-
 		// Validate root volume type and size.
 		if getImageResponse != nil {
 			if err := validateRootVolume(getImageResponse.Image.RootVolume.Size, volumes["0"]); err != nil {
@@ -317,6 +313,11 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
 		serverReq.Volumes = sanitizeVolumeMap(serverReq.Name, volumes)
 	}
 
+	// Add default volumes to server, ex: scratch storage for GPU servers
+	if serverType != nil {
+		serverReq.Volumes = addDefaultVolumes(serverType, serverReq.Volumes)
+	}
+
 	//
 	// BootType.
 	//
@@ -440,6 +441,7 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
 func addDefaultVolumes(serverType *instance.ServerType, volumes map[string]*instance.VolumeServerTemplate) map[string]*instance.VolumeServerTemplate {
 	needScratch := false
 	hasScratch := false
+	defaultVolumes := []*instance.VolumeServerTemplate(nil)
 	if serverType.ScratchStorageMaxSize != nil && *serverType.ScratchStorageMaxSize > 0 {
 		needScratch = true
 	}
@@ -450,11 +452,26 @@ func addDefaultVolumes(serverType *instance.ServerType, volumes map[string]*inst
 	}
 
 	if needScratch && !hasScratch {
-		volumeKey := strconv.Itoa(len(volumes))
-		volumes[volumeKey] = &instance.VolumeServerTemplate{
+		if volumes == nil {
+			volumes = make(map[string]*instance.VolumeServerTemplate)
+		}
+		defaultVolumes = append(defaultVolumes, &instance.VolumeServerTemplate{
 			Name:       scw.StringPtr("default-cli-scratch-volume"),
 			Size:       serverType.ScratchStorageMaxSize,
 			VolumeType: instance.VolumeVolumeTypeScratch,
+		})
+	}
+
+	if defaultVolumes != nil {
+		maxKey := 1
+		for k, _ := range volumes {
+			key, err := strconv.Atoi(k)
+			if err == nil && key > maxKey {
+				maxKey = key
+			}
+		}
+		for i, vol := range defaultVolumes {
+			volumes[strconv.Itoa(maxKey+i)] = vol
 		}
 	}
 

internal/namespaces/instance/v1/custom_server_create_test.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/alecthomas/assert"
@@ -485,3 +486,29 @@ func Test_CreateServerErrors(t *testing.T) {
 		),
 	}))
 }
+
+func Test_CreateServerScratchStorage(t *testing.T) {
+	t.Run("Default scratch storage", core.Test(&core.TestConfig{
+		Commands: GetCommands(),
+		Cmd:      "scw instance server create type=H100-1-80G image=ubuntu_jammy_gpu_os_12 --debug",
+		Check: core.TestCheckCombine(
+			core.TestCheckGolden(),
+			func(t *testing.T, ctx *core.CheckFuncCtx) {
+				fmt.Println(ctx.LogBuffer)
+			},
+			core.TestCheckExitCode(0),
+			func(t *testing.T, ctx *core.CheckFuncCtx) {
+				server, isServer := ctx.Result.(*instance.Server)
+				if !isServer {
+					t.Fatalf("Result is not a server")
+				}
+				additionalVolume, exist := server.Volumes["1"]
+				if !exist {
+					t.Fatalf("Expected an additional scratch volume, found none")
+				}
+				assert.Equal(t, additionalVolume.VolumeType, instance.VolumeServerVolumeTypeBSSD)
+			},
+		),
+		DisableParallel: true,
+	}))
+}