fix(block_volume): wait for status available before deletion (#2931)

Author: Codelax

internal/services/block/volume.go

@@ -227,7 +227,7 @@ func ResourceBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m in
 		return diag.FromErr(err)
 	}
 
-	_, err = waitForBlockVolume(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
+	_, err = waitForBlockVolumeToBeAvailable(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		if httperrors.Is404(err) {
 			d.SetId("")

internal/services/block/waiters.go

@@ -25,6 +25,25 @@ func waitForBlockVolume(ctx context.Context, blockAPI *block.API, zone scw.Zone,
 	return volume, err
 }
 
+func waitForBlockVolumeToBeAvailable(ctx context.Context, blockAPI *block.API, zone scw.Zone, id string, timeout time.Duration) (*block.Volume, error) {
+	retryInterval := defaultBlockRetryInterval
+	if transport.DefaultWaitRetryInterval != nil {
+		retryInterval = *transport.DefaultWaitRetryInterval
+	}
+
+	terminalStatus := block.VolumeStatusAvailable
+	volume, err := blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
+		Zone:          zone,
+		VolumeID:      id,
+		RetryInterval: &retryInterval,
+		Timeout:       scw.TimeDurationPtr(timeout),
+
+		VolumeTerminalStatus: &terminalStatus,
+	}, scw.WithContext(ctx))
+
+	return volume, err
+}
+
 func waitForBlockSnapshot(ctx context.Context, blockAPI *block.API, zone scw.Zone, id string, timeout time.Duration) (*block.Snapshot, error) {
 	retryInterval := defaultBlockRetryInterval
 	if transport.DefaultWaitRetryInterval != nil {