Fix reuse between data source and ressource

Author: remyleone

internal/services/block/snapshot.go

@@ -203,16 +203,25 @@ func ResourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m an
 
 	_ = d.Set("tags", snapshot.Tags)
 
+	diags := applySnapshotIdentity(d, snapshot.ID, zone)
+	if diags != nil {
+		return diags
+	}
+
+	return nil
+}
+
+func applySnapshotIdentity(d *schema.ResourceData, snapshotID string, zone scw.Zone) diag.Diagnostics {
 	identity, err := d.Identity()
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if err = identity.Set("snapshot_id", snapshot.ID); err != nil {
+	if err = identity.Set("snapshot_id", snapshotID); err != nil {
 		return diag.FromErr(err)
 	}
 
-	if err = identity.Set("zone", snapshot.Zone); err != nil {
+	if err = identity.Set("zone", zone); err != nil {
 		return diag.FromErr(err)
 	}
 

internal/services/block/snapshot_data_source.go

@@ -82,5 +82,7 @@ func DataSourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m
 		return diag.Errorf("snapshot (%s) not found", zoneID)
 	}
 
+	applySnapshotIdentity(d, snapshotID.(string), zone)
+
 	return nil
 }

internal/services/block/volume.go

@@ -207,16 +207,25 @@ func ResourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	_ = d.Set("snapshot_id", snapshotID)
 
+	diags := applyVolumeIdentity(d, volume.ID, zone)
+	if diags != nil {
+		return diags
+	}
+
+	return nil
+}
+
+func applyVolumeIdentity(d *schema.ResourceData, volumeID string, zone scw.Zone) diag.Diagnostics {
 	identity, err := d.Identity()
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if err = identity.Set("volume_id", volume.ID); err != nil {
+	if err = identity.Set("volume_id", volumeID); err != nil {
 		return diag.FromErr(err)
 	}
 
-	if err = identity.Set("zone", volume.Zone); err != nil {
+	if err = identity.Set("zone", zone); err != nil {
 		return diag.FromErr(err)
 	}
 

internal/services/block/volume_data_source.go

@@ -81,5 +81,7 @@ func DataSourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m an
 		return diag.Errorf("volume (%s) not found", zoneID)
 	}
 
+	applyVolumeIdentity(d, volumeID.(string), zone)
+
 	return nil
 }