Add toproto updates for identity to MoveResourceState RPC

Author: rainkwan

internal/fromproto5/moveresourcestate.go

@@ -38,14 +38,15 @@ func MoveResourceStateRequest(ctx context.Context, proto5 *tfprotov5.MoveResourc
 	}
 
 	fw := &fwserver.MoveResourceStateRequest{
-		SourceProviderAddress: proto5.SourceProviderAddress,
-		SourceRawState:        (*tfprotov6.RawState)(proto5.SourceState),
-		SourceSchemaVersion:   proto5.SourceSchemaVersion,
-		SourceTypeName:        proto5.SourceTypeName,
-		TargetResource:        resource,
-		TargetResourceSchema:  resourceSchema,
-		TargetTypeName:        proto5.TargetTypeName,
-		SourceIdentity:        (*tfprotov6.RawState)(proto5.SourceIdentity),
+		SourceProviderAddress:       proto5.SourceProviderAddress,
+		SourceRawState:              (*tfprotov6.RawState)(proto5.SourceState),
+		SourceSchemaVersion:         proto5.SourceSchemaVersion,
+		SourceTypeName:              proto5.SourceTypeName,
+		TargetResource:              resource,
+		TargetResourceSchema:        resourceSchema,
+		TargetTypeName:              proto5.TargetTypeName,
+		SourceIdentity:              (*tfprotov6.RawState)(proto5.SourceIdentity),
+		SourceIdentitySchemaVersion: proto5.SourceIdentitySchemaVersion,
 	}
 
 	sourcePrivate, sourcePrivateDiags := privatestate.NewData(ctx, proto5.SourcePrivate)

internal/fromproto6/moveresourcestate.go

@@ -5,7 +5,6 @@ package fromproto6
 
 import (
 	"context"
-
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwserver"
@@ -37,13 +36,15 @@ func MoveResourceStateRequest(ctx context.Context, proto6 *tfprotov6.MoveResourc
 	}
 
 	fw := &fwserver.MoveResourceStateRequest{
-		SourceProviderAddress: proto6.SourceProviderAddress,
-		SourceRawState:        proto6.SourceState,
-		SourceSchemaVersion:   proto6.SourceSchemaVersion,
-		SourceTypeName:        proto6.SourceTypeName,
-		TargetResource:        resource,
-		TargetResourceSchema:  resourceSchema,
-		TargetTypeName:        proto6.TargetTypeName,
+		SourceProviderAddress:       proto6.SourceProviderAddress,
+		SourceRawState:              proto6.SourceState,
+		SourceSchemaVersion:         proto6.SourceSchemaVersion,
+		SourceTypeName:              proto6.SourceTypeName,
+		TargetResource:              resource,
+		TargetResourceSchema:        resourceSchema,
+		TargetTypeName:              proto6.TargetTypeName,
+		SourceIdentity:              proto6.SourceIdentity,
+		SourceIdentitySchemaVersion: proto6.SourceIdentitySchemaVersion,
 	}
 
 	sourcePrivate, sourcePrivateDiags := privatestate.NewData(ctx, proto6.SourcePrivate)

internal/toproto5/moveresourcestate.go

@@ -27,6 +27,11 @@ func MoveResourceStateResponse(ctx context.Context, fw *fwserver.MoveResourceSta
 	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)
 	proto5.TargetPrivate = targetPrivate
 
+	targetIdentity, diags := ResourceIdentity(ctx, fw.TargetIdentity)
+
+	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)
+	proto5.TargetIdentity = targetIdentity
+
 	targetState, diags := State(ctx, fw.TargetState)
 
 	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)

internal/toproto6/moveresourcestate.go

@@ -27,6 +27,11 @@ func MoveResourceStateResponse(ctx context.Context, fw *fwserver.MoveResourceSta
 	proto6.Diagnostics = append(proto6.Diagnostics, Diagnostics(ctx, diags)...)
 	proto6.TargetPrivate = targetPrivate
 
+	targetIdentity, diags := ResourceIdentity(ctx, fw.TargetIdentity)
+
+	proto6.Diagnostics = append(proto6.Diagnostics, Diagnostics(ctx, diags)...)
+	proto6.TargetIdentity = targetIdentity
+
 	targetState, diags := State(ctx, fw.TargetState)
 
 	proto6.Diagnostics = append(proto6.Diagnostics, Diagnostics(ctx, diags)...)