fix(instance): add server-id attribut to detach-volume (#4922)

Author: Laure-di

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

@@ -11,6 +11,7 @@ EXAMPLES:
 
 ARGS:
   volume-id         ID of the volume to detach
+  server-id         ID of the server
   [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:

docs/commands/instance.md

@@ -1910,6 +1910,7 @@ scw instance server detach-volume [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | volume-id | Required | ID of the volume to detach |
+| server-id | Required | ID of the server |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 

internal/namespaces/instance/v1/custom_server.go

@@ -606,22 +606,27 @@ func serverDetachVolumeCommand() *core.Command {
 		Namespace: "instance",
 		Resource:  "server",
 		Verb:      "detach-volume",
-		ArgsType:  reflect.TypeOf(instance.DetachVolumeRequest{}),
+		ArgsType:  reflect.TypeOf(instance.DetachServerVolumeRequest{}),
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:     "volume-id",
 				Short:    `ID of the volume to detach`,
 				Required: true,
 			},
+			{
+				Name:     "server-id",
+				Short:    `ID of the server`,
+				Required: true,
+			},
 			core.ZoneArgSpec((*instance.API)(nil).Zones()...),
 		},
 		Run: func(ctx context.Context, argsI any) (i any, err error) {
-			request := argsI.(*instance.DetachVolumeRequest)
+			request := argsI.(*instance.DetachServerVolumeRequest)
 
 			client := core.ExtractClient(ctx)
 			api := instance.NewAPI(client)
 
-			return api.DetachVolume(request)
+			return api.DetachServerVolume(request)
 		},
 		Examples: []*core.Example{
 			{

internal/namespaces/instance/v1/custom_server_test.go

@@ -95,14 +95,18 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 				"Server",
 				testServerCommand("stopped=true image=ubuntu-jammy additional-volumes.0=block:10G"),
 			),
-			Cmd: `scw instance server detach-volume volume-id={{ (index .Server.Volumes "1").ID }}`,
+			Cmd: `scw instance server detach-volume volume-id={{ (index .Server.Volumes "1").ID }} server-id={{ .Server.ID }}`,
 			Check: func(t *testing.T, ctx *core.CheckFuncCtx) {
 				t.Helper()
 				require.NoError(t, ctx.Err)
-				resp := testhelpers.Value[*instanceSDK.DetachVolumeResponse](t, ctx.Result)
+				resp := testhelpers.Value[*instanceSDK.DetachServerVolumeResponse](t, ctx.Result)
 				assert.NotZero(t, resp.Server.Volumes["0"])
 				assert.Nil(t, resp.Server.Volumes["1"])
-				assert.Len(t, ctx.Result.(*instanceSDK.DetachVolumeResponse).Server.Volumes, 1)
+				assert.Len(
+					t,
+					ctx.Result.(*instanceSDK.DetachServerVolumeResponse).Server.Volumes,
+					1,
+				)
 			},
 			AfterFunc: core.AfterFuncCombine(
 				core.ExecAfterCmd(
@@ -117,7 +121,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
 		t.Run("invalid volume UUID", core.Test(&core.TestConfig{
 			Commands:   instance.GetCommands(),
 			BeforeFunc: createServer("Server"),
-			Cmd:        "scw instance server detach-volume volume-id=11111111-1111-1111-1111-111111111111",
+			Cmd:        "scw instance server detach-volume volume-id=11111111-1111-1111-1111-111111111111 server-id={{ .Server.ID }}",
 			Check: core.TestCheckCombine(
 				core.TestCheckGolden(),
 				core.TestCheckExitCode(1),

internal/namespaces/instance/v1/helpers_test.go

@@ -148,7 +148,7 @@ func createNonEmptyLocalVolume(metaKey string, sizeInGB int) core.BeforeFunc {
 		volume := createServerResponse.Server.Volumes["0"]
 		ctx.Meta[metaKey] = volume
 
-		cmd = "scw instance server detach-volume volume-id=" + volume.ID
+		cmd = "scw instance server detach-volume volume-id=" + volume.ID + " server-id=" + serverID
 		_ = ctx.ExecuteCmd(strings.Split(cmd, " "))
 
 		cmd = "scw instance server delete " + serverID

internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.cassette.yaml

@@ -1,11 +1,24 @@
 🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Cannot find resource 'volume' with ID '11111111-1111-1111-1111-111111111111'
+Invalid arguments 'volume_id'
+
+Details:
+- 'volume_id' does not respect constraints
+
+Hint:
+Volume 11111111-1111-1111-1111-111111111111 is not attached to this server
 🟥🟥🟥 JSON STDERR 🟥🟥🟥
 {
-  "message": "cannot find resource 'volume' with ID '11111111-1111-1111-1111-111111111111'",
+  "message": "invalid arguments 'volume_id'",
   "error": {
-    "resource": "volume",
-    "resource_id": "11111111-1111-1111-1111-111111111111"
-  }
+    "details": [
+      {
+        "argument_name": "volume_id",
+        "reason": "constraint",
+        "help_message": "Volume 11111111-1111-1111-1111-111111111111 is not attached to this server"
+      }
+    ]
+  },
+  "details": "- 'volume_id' does not respect constraints",
+  "hint": "Volume 11111111-1111-1111-1111-111111111111 is not attached to this server"
 }