Skip to content

test(instance): remove unused parameters from test helper functions #5212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remyleone merged 1 commit into from
Dec 5, 2025
Merged

test(instance): remove unused parameters from test helper functions #5212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/namespaces/instance/v1/custom_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func Test_ImageUpdate(t *testing.T) {
AfterFunc: core.AfterFuncCombine(
deleteServer("Server"),
deleteImage("ImageExtraVol"),
deleteVolume("Volume"),
deleteVolume(),
),
})
})
Expand Down
16 changes: 8 additions & 8 deletions internal/namespaces/instance/v1/custom_server_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func Test_CreateServer(t *testing.T) {
block.GetCommands(),
),
BeforeFunc: core.BeforeFuncCombine(
createSbsVolume("Volume", 20),
createSbsVolume(20),
),
Cmd: testServerCommand(
"image=ubuntu_jammy additional-volumes.0={{.Volume.ID}} stopped=true",
Expand Down Expand Up @@ -381,7 +381,7 @@ func Test_CreateServer(t *testing.T) {
block.GetCommands(),
),
BeforeFunc: core.BeforeFuncCombine(
createSbsVolume("Volume", 20),
createSbsVolume(20),
),
Cmd: testServerCommand("image=none root-volume={{.Volume.ID}} stopped=true"),
Check: core.TestCheckCombine(
Expand Down Expand Up @@ -689,13 +689,13 @@ func Test_CreateServerErrors(t *testing.T) {

t.Run("Error: invalid total local volumes size: too low 3", core.Test(&core.TestConfig{
Commands: instance.GetCommands(),
BeforeFunc: createVolume("Volume", 5, instanceSDK.VolumeVolumeTypeLSSD),
BeforeFunc: createVolume(5),
Cmd: testServerCommand("image=ubuntu_jammy root-volume={{ .Volume.ID }}"),
Check: core.TestCheckCombine(
core.TestCheckGolden(),
core.TestCheckExitCode(1),
),
AfterFunc: deleteVolume("Volume"),
AfterFunc: deleteVolume(),
DisableParallel: true,
}))

Expand Down Expand Up @@ -723,15 +723,15 @@ func Test_CreateServerErrors(t *testing.T) {

t.Run("Error: invalid total local volumes size: too high 3", core.Test(&core.TestConfig{
Commands: instance.GetCommands(),
BeforeFunc: createVolume("Volume", 20, instanceSDK.VolumeVolumeTypeLSSD),
BeforeFunc: createVolume(20),
Cmd: testServerCommand(
"image=ubuntu_jammy root-volume={{ .Volume.ID }} additional-volumes.0=local:10GB",
),
Check: core.TestCheckCombine(
core.TestCheckGolden(),
core.TestCheckExitCode(1),
),
AfterFunc: deleteVolume("Volume"),
AfterFunc: deleteVolume(),
DisableParallel: true,
}))

Expand All @@ -749,13 +749,13 @@ func Test_CreateServerErrors(t *testing.T) {

t.Run("Error: disallow existing root volume ID", core.Test(&core.TestConfig{
Commands: instance.GetCommands(),
BeforeFunc: createVolume("Volume", 20, instanceSDK.VolumeVolumeTypeLSSD),
BeforeFunc: createVolume(20),
Cmd: testServerCommand("image=ubuntu_jammy root-volume={{ .Volume.ID }}"),
Check: core.TestCheckCombine(
core.TestCheckGolden(),
core.TestCheckExitCode(1),
),
AfterFunc: deleteVolume("Volume"),
AfterFunc: deleteVolume(),
DisableParallel: true,
}))

Expand Down
6 changes: 3 additions & 3 deletions internal/namespaces/instance/v1/custom_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
),
BeforeFunc: core.BeforeFuncCombine(
createServer("Server"),
createSbsVolume("Volume", 10),
createSbsVolume(10),
),
Cmd: "scw instance server attach-volume server-id={{ .Server.ID }} volume-id={{ .Volume.ID }}",
Check: core.TestCheckCombine(
Expand All @@ -51,7 +51,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
Commands: instance.GetCommands(),
BeforeFunc: core.BeforeFuncCombine(
createServer("Server"),
createVolume("Volume", 10, instanceSDK.VolumeVolumeTypeLSSD),
createVolume(10),
),
Cmd: "scw instance server attach-volume server-id={{ .Server.ID }} volume-id={{ .Volume.ID }}",
Check: core.TestCheckCombine(
Expand Down Expand Up @@ -283,7 +283,7 @@ func Test_ServerUpdateCustom(t *testing.T) {
),
BeforeFunc: core.BeforeFuncCombine(
createServer("Server"),
createSbsVolume("Volume", 10),
createSbsVolume(10),
),
Cmd: `scw instance server update {{ .Server.ID }} volume-ids.0={{ (index .Server.Volumes "0").ID }} volume-ids.1={{ .Volume.ID }}`,
Check: core.TestCheckCombine(
Expand Down
4 changes: 2 additions & 2 deletions internal/namespaces/instance/v1/custom_snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func Test_UpdateSnapshot(t *testing.T) {
),
AfterFunc: core.AfterFuncCombine(
deleteSnapshot("CreateSnapshot"),
deleteVolume("Volume"),
deleteVolume(),
),
}))
t.Run("Change name", core.Test(&core.TestConfig{
Expand Down Expand Up @@ -65,7 +65,7 @@ func Test_UpdateSnapshot(t *testing.T) {
),
AfterFunc: core.AfterFuncCombine(
deleteSnapshot("CreateSnapshot"),
deleteVolume("Volume"),
deleteVolume(),
),
}))
})
Expand Down
21 changes: 9 additions & 12 deletions internal/namespaces/instance/v1/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,34 +87,31 @@ func deleteServer(metaKey string) core.AfterFunc {
//

// createVolume creates a volume of the given size and type and
// register it in the context Meta at metaKey.
// register it in the context Meta at "Volume".
func createVolume(
metaKey string,
sizeInGb int,
volumeType instanceSDK.VolumeVolumeType,
) core.BeforeFunc {
return func(ctx *core.BeforeFuncCtx) error {
cmd := fmt.Sprintf(
"scw instance volume create name=cli-test size=%dGB volume-type=%s",
"scw instance volume create name=cli-test size=%dGB volume-type=l_ssd",
sizeInGb,
volumeType,
)
res := ctx.ExecuteCmd(strings.Split(cmd, " "))
createVolumeResponse := res.(*instanceSDK.CreateVolumeResponse)
ctx.Meta[metaKey] = createVolumeResponse.Volume
ctx.Meta["Volume"] = createVolumeResponse.Volume

return nil
}
}

// deleteVolume deletes a volume previously registered in the context Meta at metaKey.
func deleteVolume(metaKey string) core.AfterFunc {
return core.ExecAfterCmd("scw instance volume delete {{ ." + metaKey + ".ID }}")
// deleteVolume deletes a volume previously registered in the context Meta at "Volume".
func deleteVolume() core.AfterFunc {
return core.ExecAfterCmd("scw instance volume delete {{ .Volume.ID }}")
}

// createSbsVolume creates a volume of the given size and
// register it in the context Meta at metaKey
func createSbsVolume(metaKey string, sizeInGb int) core.BeforeFunc {
// register it in the context Meta at "Volume".
func createSbsVolume(sizeInGb int) core.BeforeFunc {
return func(ctx *core.BeforeFuncCtx) error {
cmd := fmt.Sprintf(
"scw block volume create name=%s from-empty.size=%dGB perf-iops=5000 -w",
Expand All @@ -123,7 +120,7 @@ func createSbsVolume(metaKey string, sizeInGb int) core.BeforeFunc {
)
res := ctx.ExecuteCmd(strings.Split(cmd, " "))
volume := res.(*block.Volume)
ctx.Meta[metaKey] = volume
ctx.Meta["Volume"] = volume

return nil
}
Expand Down
Loading