fix(instance): delete with-volumes none worked like all (#3025)

Author: Codelax

cmd/scw/testdata/test-all-usage-instance-server-delete-usage.golden

@@ -13,11 +13,11 @@ EXAMPLES:
     scw instance server delete 11111111-1111-1111-1111-111111111111 zone=fr-par-1
 
 ARGS:
-  server-id             
-  [with-volumes=none]   Delete the volumes attached to the server (none | local | block | root | all)
-  [with-ip]             Delete the IP attached to the server
-  [force-shutdown]      Force shutdown of the instance server before deleting it
-  [zone=fr-par-1]       Zone to target. If none is passed will use default zone from the config
+  server-id            
+  [with-volumes=all]   Delete the volumes attached to the server (none | local | block | root | all)
+  [with-ip]            Delete the IP attached to the server
+  [force-shutdown]     Force shutdown of the instance server before deleting it
+  [zone=fr-par-1]      Zone to target. If none is passed will use default zone from the config
 
 FLAGS:
   -h, --help   help for delete

docs/commands/instance.md

@@ -1756,7 +1756,7 @@ scw instance server delete <server-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required |  |
-| with-volumes | Default: `none`<br />One of: `none`, `local`, `block`, `root`, `all` | Delete the volumes attached to the server |
+| with-volumes | Default: `all`<br />One of: `none`, `local`, `block`, `root`, `all` | Delete the volumes attached to the server |
 | with-ip |  | Delete the IP attached to the server |
 | force-shutdown |  | Force shutdown of the instance server before deleting it |
 | zone | Default: `fr-par-1` | Zone to target. If none is passed will use default zone from the config |

internal/namespaces/instance/v1/custom_server.go

@@ -915,7 +915,7 @@ func serverDeleteCommand() *core.Command {
 			{
 				Name:    "with-volumes",
 				Short:   "Delete the volumes attached to the server",
-				Default: core.DefaultValueSetter("none"),
+				Default: core.DefaultValueSetter("all"),
 				EnumValues: []string{
 					string(withVolumesNone),
 					string(withVolumesLocal),
@@ -1013,10 +1013,11 @@ func serverDeleteCommand() *core.Command {
 			}
 
 			deletedVolumeMessages := [][2]string(nil)
+		volumeDelete:
 			for index, volume := range server.Server.Volumes {
 				switch {
 				case deleteServerArgs.WithVolumes == withVolumesNone:
-					break
+					break volumeDelete
 				case deleteServerArgs.WithVolumes == withVolumesRoot && index != "0":
 					continue
 				case deleteServerArgs.WithVolumes == withVolumesLocal && volume.VolumeType != instance.VolumeServerVolumeTypeLSSD:

internal/namespaces/instance/v1/custom_server_test.go

@@ -274,6 +274,26 @@ func Test_ServerDelete(t *testing.T) {
 		DisableParallel: true,
 	}))
 
+	t.Run("with none volumes", core.Test(&core.TestConfig{
+		Commands:   GetCommands(),
+		BeforeFunc: core.ExecStoreBeforeCmd("Server", "scw instance server create stopped=true image=ubuntu-bionic additional-volumes.0=block:10G"),
+		Cmd:        `scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=none`,
+		Check: core.TestCheckCombine(
+			core.TestCheckGolden(),
+			core.TestCheckExitCode(0),
+			func(t *testing.T, ctx *core.CheckFuncCtx) {
+				api := instance.NewAPI(ctx.Client)
+				server := ctx.Meta["Server"].(*instance.Server)
+				_, err := api.GetVolume(&instance.GetVolumeRequest{
+					VolumeID: server.Volumes["0"].ID,
+				})
+				assert.NoError(t, err)
+			},
+		),
+		AfterFunc:       core.ExecAfterCmd(`scw instance volume delete {{ (index .Server.Volumes "0").ID }}`),
+		DisableParallel: true,
+	}))
+
 	interactive.IsInteractive = false
 }