fallback to deletion if termination fails + add context in reachState func

Author: Mia-Cross

internal/services/instance/helpers_instance.go

@@ -184,7 +184,7 @@ func reachState(ctx context.Context, api *instancehelpers.BlockAndInstanceAPI, z
 				VolumeID:      volume.ID,
 				Zone:          zone,
 				RetryInterval: transport.DefaultWaitRetryInterval,
-			})
+			}, scw.WithContext(ctx))
 			if err != nil {
 				return err
 			}
@@ -193,7 +193,7 @@ func reachState(ctx context.Context, api *instancehelpers.BlockAndInstanceAPI, z
 				Zone:          zone,
 				VolumeID:      volume.ID,
 				RetryInterval: transport.DefaultWaitRetryInterval,
-			})
+			}, scw.WithContext(ctx))
 			if err != nil {
 				return err
 			}
@@ -207,7 +207,7 @@ func reachState(ctx context.Context, api *instancehelpers.BlockAndInstanceAPI, z
 			Zone:          zone,
 			Timeout:       scw.TimeDurationPtr(DefaultInstanceServerWaitTimeout),
 			RetryInterval: transport.DefaultWaitRetryInterval,
-		})
+		}, scw.WithContext(ctx))
 		if err != nil {
 			return err
 		}

internal/services/instance/server.go

@@ -1014,6 +1014,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	if d.HasChange("admin_password_encryption_ssh_key_id") {
+		serverShouldUpdate = true
 		updateRequest.AdminPasswordEncryptionSSHKeyID = types.ExpandUpdatedStringPtr(d.Get("admin_password_encryption_ssh_key_id").(string))
 	}
 
@@ -1243,24 +1244,6 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
-	// reach running state (mandatory for termination)
-	err = reachState(ctx, api, zone, id, instanceSDK.ServerStateRunning)
-	if err != nil && !httperrors.Is404(err) {
-		return diag.FromErr(err)
-	}
-
-	timeout := d.Timeout(schema.TimeoutDelete)
-
-	err = api.ServerActionAndWait(&instanceSDK.ServerActionAndWaitRequest{
-		Zone:     zone,
-		ServerID: id,
-		Action:   instanceSDK.ServerActionTerminate,
-		Timeout:  &timeout,
-	}, scw.WithContext(ctx))
-	if err != nil && !httperrors.Is404(err) {
-		return diag.FromErr(err)
-	}
-
 	// Delete private-nic if managed by instance_server resource
 	if raw, ok := d.GetOk("private_network"); ok {
 		ph, err := newPrivateNICHandler(api.API, id, zone)
@@ -1279,6 +1262,19 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
+	_, err = waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutDelete))
+	if err != nil && !httperrors.Is404(err) {
+		return diag.FromErr(err)
+	}
+
+	err = terminateServer(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
+	if err != nil {
+		err = deleteServer(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	// Related to https://github.com/hashicorp/terraform-plugin-sdk/issues/142
 	_, rootVolumeAttributeSet := d.GetOk("root_volume")
 	if d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet {
@@ -1299,6 +1295,54 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 	return nil
 }
 
+func terminateServer(ctx context.Context, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, id string, timeout time.Duration) error {
+	// reach running state (mandatory for termination)
+	err := reachState(ctx, api, zone, id, instanceSDK.ServerStateRunning)
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	err = api.ServerActionAndWait(&instanceSDK.ServerActionAndWaitRequest{
+		Zone:     zone,
+		ServerID: id,
+		Action:   instanceSDK.ServerActionTerminate,
+		Timeout:  &timeout,
+	}, scw.WithContext(ctx))
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	return nil
+}
+
+func deleteServer(ctx context.Context, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, id string, timeout time.Duration) error {
+	_, err := waitForServer(ctx, api.API, zone, id, timeout)
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	// reach stopped state
+	err = reachState(ctx, api, zone, id, instanceSDK.ServerStateStopped)
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	err = api.DeleteServer(&instanceSDK.DeleteServerRequest{
+		Zone:     zone,
+		ServerID: id,
+	}, scw.WithContext(ctx))
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	_, err = waitForServer(ctx, api.API, zone, id, timeout)
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+
+	return nil
+}
+
 func instanceServerCanMigrate(api *instanceSDK.API, server *instanceSDK.Server, requestedType string) error {
 	var localVolumeSize scw.Size