Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-rdb-instance-list-usage.golden

@@ -6,12 +6,13 @@ USAGE:
   scw rdb instance list [arg=value ...]
 
 ARGS:
-  [tags.{index}]      List Database Instances that have a given tag
-  [name]              Lists Database Instances that match a name pattern
-  [order-by]          Criteria to use when ordering Database Instance listings (created_at_asc | created_at_desc | name_asc | name_desc | region | status_asc | status_desc)
-  [project-id]        Project ID to list the Database Instance of
-  [organization-id]   Please use project_id instead
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
+  [tags.{index}]       List Database Instances that have a given tag
+  [name]               Lists Database Instances that match a name pattern
+  [order-by]           Criteria to use when ordering Database Instance listings (created_at_asc | created_at_desc | name_asc | name_desc | region | status_asc | status_desc)
+  [project-id]         Project ID to list the Database Instance of
+  [has-maintenances]   Filter to only list instances with a scheduled maintenance
+  [organization-id]    Please use project_id instead
+  [region=fr-par]      Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 
 FLAGS:
   -h, --help   help for list

docs/commands/rdb.md

@@ -875,6 +875,7 @@ scw rdb instance list [arg=value ...]
 | name |  | Lists Database Instances that match a name pattern |
 | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc`, `region`, `status_asc`, `status_desc` | Criteria to use when ordering Database Instance listings |
 | project-id |  | Project ID to list the Database Instance of |
+| has-maintenances |  | Filter to only list instances with a scheduled maintenance |
 | organization-id |  | Please use project_id instead |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.13.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250617152214-69633d417037
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250618150302-dd86fd661356
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6

go.sum

@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 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.33.0.20250617152214-69633d417037 h1:NfJcMj32LgXi0YZ/a4FklGJ1y7fvTjXpbTKGYwZvfrg=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250617152214-69633d417037/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250618150302-dd86fd661356 h1:9cMV1lFohW5MTZJ5YRa3bjhOjErTdnAV27GkGJUlaRk=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250618150302-dd86fd661356/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/instance/v1/custom_server_action.go

@@ -5,10 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"sort"
 	"strings"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
+	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"
 )
@@ -394,6 +396,46 @@ func serverTerminateCommand() *core.Command {
 					}
 					_, _ = interactive.Printf("successfully detached volume %s\n", volumeName)
 				}
+			} else {
+				successMessages := make(map[string]string)
+
+				for index, volume := range server.Server.Volumes {
+					if volume.VolumeType != instance.VolumeServerVolumeTypeSbsVolume {
+						continue
+					}
+
+					_, err = api.DetachVolume(&instance.DetachVolumeRequest{
+						VolumeID: volume.ID,
+						Zone:     volume.Zone,
+					}, scw.WithContext(ctx))
+					if err != nil {
+						return nil, fmt.Errorf("failed to detach block volume %s: %w", volume.ID, err)
+					}
+
+					blockAPI := block.NewAPI(client)
+					terminalStatus := block.VolumeStatusAvailable
+
+					blockVolume, err := blockAPI.WaitForVolume(&block.WaitForVolumeRequest{
+						VolumeID:       volume.ID,
+						Zone:           volume.Zone,
+						TerminalStatus: &terminalStatus,
+					})
+					if err != nil {
+						return nil, fmt.Errorf("failed to wait for block volume %s: %w", volume.ID, err)
+					}
+
+					err = blockAPI.DeleteVolume(&block.DeleteVolumeRequest{
+						VolumeID: blockVolume.ID,
+						Zone:     blockVolume.Zone,
+					}, scw.WithContext(ctx))
+					if err != nil {
+						return nil, fmt.Errorf("failed to delete block volume %s: %w", blockVolume.Name, err)
+					}
+
+					successMessages[index] = fmt.Sprintf("successfully deleted block volume %q", blockVolume.Name)
+				}
+
+				printSuccessMessagesInOrder(successMessages)
 			}
 
 			if _, err := api.ServerAction(&instance.ServerActionRequest{
@@ -439,7 +481,8 @@ func shouldDeleteBlockVolumes(
 	case withBlockPrompt:
 		// Only prompt user if at least one block volume is attached to the instance
 		for _, volume := range server.Server.Volumes {
-			if volume.VolumeType != instance.VolumeServerVolumeTypeBSSD {
+			if volume.VolumeType != instance.VolumeServerVolumeTypeBSSD &&
+				volume.VolumeType != instance.VolumeServerVolumeTypeSbsVolume {
 				continue
 			}
 
@@ -456,6 +499,19 @@ func shouldDeleteBlockVolumes(
 	}
 }
 
+// printSuccessMessagesInOrder prints volume deletion messages ordered by volume map key "0", "1", "2",...
+func printSuccessMessagesInOrder(messages map[string]string) {
+	indexes := []string(nil)
+	for index := range messages {
+		indexes = append(indexes, index)
+	}
+	sort.Strings(indexes)
+
+	for _, index := range indexes {
+		_, _ = interactive.Println(messages[index])
+	}
+}
+
 type instanceUniqueActionRequest struct {
 	Zone     scw.Zone
 	ServerID string

internal/namespaces/instance/v1/custom_server_action_test.go

@@ -8,6 +8,7 @@ import (
 	block "github.com/scaleway/scaleway-cli/v2/internal/namespaces/block/v1alpha1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
+	blockSDK "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/assert"
@@ -25,7 +26,7 @@ func Test_ServerTerminate(t *testing.T) {
 			"Server",
 			testServerCommand("image=ubuntu-jammy ip=new -w"),
 		),
-		Cmd: `scw instance server terminate {{ .Server.ID }}`,
+		Cmd: `scw instance server terminate {{ .Server.ID }} with-block=true`,
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
@@ -56,7 +57,7 @@ func Test_ServerTerminate(t *testing.T) {
 			"Server",
 			testServerCommand("image=ubuntu-jammy ip=new -w"),
 		),
-		Cmd: `scw instance server terminate {{ .Server.ID }} with-ip=true`,
+		Cmd: `scw instance server terminate {{ .Server.ID }} with-ip=true with-block=true`,
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
@@ -98,6 +99,10 @@ func Test_ServerTerminate(t *testing.T) {
 				`scw block volume wait terminal-status=available {{ (index .Server.Volumes "1").ID }}`,
 			),
 			core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
+			core.ExecAfterCmd(
+				`scw block volume wait terminal-status=available {{ (index .Server.Volumes "0").ID }}`,
+			),
+			core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "0").ID }}`),
 		),
 		DisableParallel: true,
 	}))
@@ -114,16 +119,23 @@ func Test_ServerTerminate(t *testing.T) {
 			core.TestCheckExitCode(0),
 			func(t *testing.T, ctx *core.CheckFuncCtx) {
 				t.Helper()
-				api := instanceSDK.NewAPI(ctx.Client)
+				api := blockSDK.NewAPI(ctx.Client)
 				server := testhelpers.MapValue[*instance.ServerWithWarningsResponse](
 					t,
 					ctx.Meta,
 					"Server",
 				).Server
-				volume := testhelpers.MapTValue(t, server.Volumes, "0")
+				rootVolume := testhelpers.MapTValue(t, server.Volumes, "0")
+
+				_, err := api.GetVolume(&blockSDK.GetVolumeRequest{
+					VolumeID: rootVolume.ID,
+					Zone:     server.Zone,
+				})
+				require.IsType(t, &scw.ResourceNotFoundError{}, err)
 
-				_, err := api.GetVolume(&instanceSDK.GetVolumeRequest{
-					VolumeID: volume.ID,
+				additionalVolume := testhelpers.MapTValue(t, server.Volumes, "1")
+				_, err = api.GetVolume(&blockSDK.GetVolumeRequest{
+					VolumeID: additionalVolume.ID,
 					Zone:     server.Zone,
 				})
 				require.IsType(t, &scw.ResourceNotFoundError{}, err)