mutualize between ressource schema and data source schema

Author: remyleone

internal/services/block/snapshot.go

@@ -33,23 +33,7 @@ func ResourceSnapshot() *schema.Resource {
 			Default: schema.DefaultTimeout(defaultBlockTimeout),
 		},
 		SchemaVersion: 0,
-		Identity: &schema.ResourceIdentity{
-			Version: 0,
-			SchemaFunc: func() map[string]*schema.Schema {
-				return map[string]*schema.Schema{
-					"snapshot_id": {
-						Type:              schema.TypeString,
-						RequiredForImport: true,
-						Description:       "Snapshot ID",
-					},
-					"zone": {
-						Type:              schema.TypeString,
-						RequiredForImport: true,
-						Description:       "Zone ID",
-					},
-				}
-			},
-		},
+		Identity:      blockIdentity(),
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:        schema.TypeString,
@@ -227,6 +211,7 @@ func ResourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m an
 	if err = identity.Set("snapshot_id", snapshot.ID); err != nil {
 		return diag.FromErr(err)
 	}
+
 	if err = identity.Set("zone", snapshot.Zone); err != nil {
 		return diag.FromErr(err)
 	}
@@ -311,3 +296,23 @@ func ResourceBlockSnapshotDelete(ctx context.Context, d *schema.ResourceData, m
 
 	return nil
 }
+
+func blockIdentity() *schema.ResourceIdentity {
+	return &schema.ResourceIdentity{
+		Version: 0,
+		SchemaFunc: func() map[string]*schema.Schema {
+			return map[string]*schema.Schema{
+				"snapshot_id": {
+					Type:              schema.TypeString,
+					RequiredForImport: true,
+					Description:       "Snapshot ID",
+				},
+				"zone": {
+					Type:              schema.TypeString,
+					RequiredForImport: true,
+					Description:       "Zone ID",
+				},
+			}
+		},
+	}
+}

internal/services/block/snapshot_data_source.go

@@ -28,6 +28,7 @@ func DataSourceSnapshot() *schema.Resource {
 	return &schema.Resource{
 		ReadContext: DataSourceBlockSnapshotRead,
 		Schema:      dsSchema,
+		Identity:    blockIdentity(),
 	}
 }
 

internal/services/block/volume.go

@@ -26,23 +26,7 @@ func ResourceVolume() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		Identity: &schema.ResourceIdentity{
-			Version: 0,
-			SchemaFunc: func() map[string]*schema.Schema {
-				return map[string]*schema.Schema{
-					"volume_id": {
-						Type:              schema.TypeString,
-						RequiredForImport: true,
-						Description:       "Volume ID",
-					},
-					"zone": {
-						Type:              schema.TypeString,
-						RequiredForImport: true,
-						Description:       "Zone",
-					},
-				}
-			},
-		},
+		Identity: volumeIdentity(),
 		Timeouts: &schema.ResourceTimeout{
 			Create:  schema.DefaultTimeout(defaultBlockTimeout),
 			Read:    schema.DefaultTimeout(defaultBlockTimeout),
@@ -100,6 +84,26 @@ func ResourceVolume() *schema.Resource {
 	}
 }
 
+func volumeIdentity() *schema.ResourceIdentity {
+	return &schema.ResourceIdentity{
+		Version: 0,
+		SchemaFunc: func() map[string]*schema.Schema {
+			return map[string]*schema.Schema{
+				"volume_id": {
+					Type:              schema.TypeString,
+					RequiredForImport: true,
+					Description:       "Volume ID",
+				},
+				"zone": {
+					Type:              schema.TypeString,
+					RequiredForImport: true,
+					Description:       "Zone",
+				},
+			}
+		},
+	}
+}
+
 func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	api, zone, err := instancehelpers.InstanceAndBlockAPIWithZone(d, m)
 	if err != nil {
@@ -211,6 +215,7 @@ func ResourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m any)
 	if err = identity.Set("volume_id", volume.ID); err != nil {
 		return diag.FromErr(err)
 	}
+
 	if err = identity.Set("zone", volume.Zone); err != nil {
 		return diag.FromErr(err)
 	}

internal/services/block/volume_data_source.go

@@ -28,6 +28,7 @@ func DataSourceVolume() *schema.Resource {
 	return &schema.Resource{
 		ReadContext: DataSourceBlockVolumeRead,
 		Schema:      dsSchema,
+		Identity:    volumeIdentity(),
 	}
 }