fix(block): remove forceNew to add customdiff

Author: Laure-di

internal/services/block/helpers_block.go

@@ -2,6 +2,7 @@ package block
 
 import (
 	"context"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
@@ -68,11 +69,16 @@ func customDiffSnapshot(key string) schema.CustomizeDiffFunc {
 		_, err := blockAPI.GetSnapshot(&block.GetSnapshotRequest{
 			SnapshotID: oldValue.(string),
 		})
-		if (httperrors.Is403(err) || httperrors.Is404(err)) && newValue == nil {
+		logging.L.Debugf("customDiffSnapshot: old=%s, new=%s", oldValue, newValue)
+		logging.L.Debugf("error: %v", err)
+
+		if httperrors.Is403(err) || httperrors.Is404(err) {
+			logging.L.Infof("customDiffSnapshot: snapshot %s is missing or forbidden", oldValue)
 			return nil
 		}
 
-		return diff.ForceNew("snapshot_id")
+		logging.L.Infof("customDiffSnapshot: forcing recreation due to snapshot_id change")
+		return diff.ForceNew(key)
 	}
 }
 

internal/services/block/volume.go

@@ -2,7 +2,6 @@ package block
 
 import (
 	"context"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -201,6 +200,7 @@ func ResourceBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, m an
 	req := &block.UpdateVolumeRequest{
 		Zone:     zone,
 		VolumeID: volume.ID,
+		Name:     types.ExpandUpdatedStringPtr(volume.Name),
 	}
 
 	if d.HasChange("name") {