Add initial updates for identity to MoveResourceState RPC

Author: rainkwan

internal/fromproto5/moveresourcestate.go

@@ -45,6 +45,7 @@ func MoveResourceStateRequest(ctx context.Context, proto5 *tfprotov5.MoveResourc
 		TargetResource:        resource,
 		TargetResourceSchema:  resourceSchema,
 		TargetTypeName:        proto5.TargetTypeName,
+		SourceIdentity:        (*tfprotov6.RawState)(proto5.SourceIdentity),
 	}
 
 	sourcePrivate, sourcePrivateDiags := privatestate.NewData(ctx, proto5.SourcePrivate)

internal/fwserver/server_moveresourcestate.go

@@ -65,14 +65,23 @@ type MoveResourceStateRequest struct {
 	// TargetTypeName is the type name of the target resource as given by
 	// Terraform across the protocol.
 	TargetTypeName string
+
+	// SourceIdentity is the identity of the source resource.
+	//
+	// Only the underlying JSON field is populated.
+	SourceIdentity *tfprotov6.RawState
+
+	// SourceIdentitySchemaVersion is the version of the source resource state.
+	SourceIdentitySchemaVersion int64
 }
 
 // MoveResourceStateResponse is the framework server response for the
 // MoveResourceState RPC.
 type MoveResourceStateResponse struct {
-	Diagnostics   diag.Diagnostics
-	TargetPrivate *privatestate.Data
-	TargetState   *tfsdk.State
+	Diagnostics    diag.Diagnostics
+	TargetPrivate  *privatestate.Data
+	TargetState    *tfsdk.State
+	TargetIdentity *tfsdk.ResourceIdentity
 }
 
 // MoveResourceState implements the framework server MoveResourceState RPC.
@@ -125,18 +134,25 @@ func (s *Server) MoveResourceState(ctx context.Context, req *MoveResourceStateRe
 
 	for _, resourceStateMover := range resourceStateMovers {
 		moveStateReq := resource.MoveStateRequest{
-			SourcePrivate:         sourcePrivate,
-			SourceProviderAddress: req.SourceProviderAddress,
-			SourceRawState:        req.SourceRawState,
-			SourceSchemaVersion:   req.SourceSchemaVersion,
-			SourceTypeName:        req.SourceTypeName,
+			SourcePrivate:               sourcePrivate,
+			SourceProviderAddress:       req.SourceProviderAddress,
+			SourceRawState:              req.SourceRawState,
+			SourceSchemaVersion:         req.SourceSchemaVersion,
+			SourceTypeName:              req.SourceTypeName,
+			SourceIdentity:              req.SourceIdentity,
+			SourceIdentitySchemaVersion: req.SourceIdentitySchemaVersion,
 		}
 		moveStateResp := resource.MoveStateResponse{
 			TargetPrivate: privatestate.EmptyProviderData(ctx),
 			TargetState: tfsdk.State{
 				Schema: req.TargetResourceSchema,
 				Raw:    tftypes.NewValue(req.TargetResourceSchema.Type().TerraformType(ctx), nil),
 			},
+			// TODO: See if we need to change this to identity
+			TargetIdentity: &tfsdk.ResourceIdentity{
+				Raw:    tftypes.NewValue(req.TargetResourceSchema.Type().TerraformType(ctx), nil),
+				Schema: req.TargetResourceSchema,
+			},
 		}
 
 		if resourceStateMover.SourceSchema != nil {
@@ -237,6 +253,8 @@ func (s *Server) MoveResourceState(ctx context.Context, req *MoveResourceStateRe
 			"Source Provider Address: "+req.SourceProviderAddress+"\n"+
 			"Source Resource Type: "+req.SourceTypeName+"\n"+
 			"Source Resource Schema Version: "+strconv.FormatInt(req.SourceSchemaVersion, 10)+"\n"+
-			"Target Resource Type: "+req.TargetTypeName,
+			"Target Resource Type: "+req.TargetTypeName, //+"\n"+
+		// "Source Identity Schema Version: "+strconv.FormatInt(req.SourceSchemaVersion, 10),
+
 	)
 }

resource/move_state.go

@@ -75,6 +75,14 @@ type MoveStateRequest struct {
 	// other request fields, to determine whether the request should be handled
 	// by this particular implementation.
 	SourceTypeName string
+
+	// SourceIdentity is the identity of the source resource.
+	//
+	// Only the underlying JSON field is populated.
+	SourceIdentity *tfprotov6.RawState
+
+	// SourceIdentitySchemaVersion is the version of the source resource state.
+	SourceIdentitySchemaVersion int64
 }
 
 // MoveStateResponse represents a response to a MoveStateRequest.
@@ -107,4 +115,7 @@ type MoveStateResponse struct {
 	// operation. This field is not pre-populated as it is up to implementations
 	// whether the source private data is relevant for the target resource.
 	TargetPrivate *privatestate.ProviderData
+
+	// TargetIdentity is the identity of the target resource.
+	TargetIdentity *tfsdk.ResourceIdentity
 }