fix(instance): wait for volumes after server deletion (scaleway#4149)

Author: Codelax

internal/namespaces/instance/v1/custom_server_create_builder.go

@@ -274,7 +274,7 @@ func (sb *ServerBuilder) ValidateVolumes() error {
 				return err
 			}
 		} else {
-			logger.Warningf("skipping root volume validation")
+			logger.Warningf("skipping root volume validation\n")
 		}
 
 		// Validate total local volume sizes.
@@ -283,7 +283,7 @@ func (sb *ServerBuilder) ValidateVolumes() error {
 				return err
 			}
 		} else {
-			logger.Warningf("skip local volume size validation")
+			logger.Warningf("skip local volume size validation\n")
 		}
 
 		// Sanitize the volume map to respect API schemas

internal/namespaces/instance/v1/custom_server_delete.go

@@ -190,22 +190,9 @@ func serverDeleteCommand() *core.Command {
 				case volume.VolumeType == instance.VolumeServerVolumeTypeScratch:
 					continue
 				}
-				if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
-					err = block.NewAPI(client).DeleteVolume(&block.DeleteVolumeRequest{
-						Zone:     deleteServerArgs.Zone,
-						VolumeID: volume.ID,
-					})
-				} else {
-					err = api.DeleteVolume(&instance.DeleteVolumeRequest{
-						Zone:     deleteServerArgs.Zone,
-						VolumeID: volume.ID,
-					})
-				}
+				err := serverDeleteVolume(volume, api, block.NewAPI(client))
 				if err != nil {
-					return nil, &core.CliError{
-						Err:  err,
-						Hint: "Make sure this resource have been deleted or try to delete it manually.",
-					}
+					return nil, err
 				}
 				humanSize, err := human.Marshal(volume.Size, nil)
 				if err != nil {
@@ -235,3 +222,45 @@ func serverDeleteCommand() *core.Command {
 		},
 	}
 }
+
+func errorDeletingResource(err error) error {
+	return &core.CliError{
+		Err:  err,
+		Hint: "Make sure this resource have been deleted or try to delete it manually.",
+	}
+}
+
+func serverDeleteVolume(volume *instance.VolumeServer, instanceAPI *instance.API, blockAPI *block.API) error {
+	var err error
+
+	if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
+		_, err = blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
+			Zone:     volume.Zone,
+			VolumeID: volume.ID,
+		})
+		if err != nil {
+			return errorDeletingResource(err)
+		}
+
+		err = blockAPI.DeleteVolume(&block.DeleteVolumeRequest{
+			Zone:     volume.Zone,
+			VolumeID: volume.ID,
+		})
+	} else {
+		_, err = instanceAPI.WaitForVolume(&instance.WaitForVolumeRequest{
+			VolumeID: volume.ID,
+			Zone:     volume.Zone,
+		})
+		if err != nil {
+			return errorDeletingResource(err)
+		}
+		err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{
+			Zone:     volume.Zone,
+			VolumeID: volume.ID,
+		})
+	}
+	if err != nil {
+		return errorDeletingResource(err)
+	}
+	return nil
+}

internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml

@@ -1,7 +1,7 @@
 🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Cannot create the server: failed to build volume template: volume 3260c736-5a82-4d5e-b455-439a07e52317 is already attached to f8050da0-db3d-45c9-b51f-6215300b07d8 server
+Cannot create the server: failed to build volume template: volume 2fa51c6d-69b2-4bdd-bef8-80f011e72f33 is already attached to 8c6642d3-5c68-4e73-aa61-f655e5fbbe9c server
 🟥🟥🟥 JSON STDERR 🟥🟥🟥
 {
-  "error": "cannot create the server: failed to build volume template: volume 3260c736-5a82-4d5e-b455-439a07e52317 is already attached to f8050da0-db3d-45c9-b51f-6215300b07d8 server"
+  "error": "cannot create the server: failed to build volume template: volume 2fa51c6d-69b2-4bdd-bef8-80f011e72f33 is already attached to 8c6642d3-5c68-4e73-aa61-f655e5fbbe9c server"
 }