Updated protocol to reflect core changes to protocol move request (#487)

* Updated protocol to reflect core changes to raw identity

* RawIdentity

Co-authored-by: Austin Valle <[email protected]>

* RawIdentity

Co-authored-by: Austin Valle <[email protected]>

* Update tfprotov6/resource.go

Co-authored-by: Austin Valle <[email protected]>

* Update tfprotov5/resource.go

Co-authored-by: Austin Valle <[email protected]>

* Fixed bug from suggestions

* Fixed bug from suggestions

---------

Co-authored-by: Austin Valle <[email protected]>

Author: rainkwan

tfprotov5/internal/fromproto/raw_identity.go

@@ -42,7 +42,7 @@ func UpgradeResourceIdentityRequest(in *tfplugin5.UpgradeResourceIdentity_Reques
 	}
 
 	resp := &tfprotov5.UpgradeResourceIdentityRequest{
-		RawIdentity: RawIdentity(in.RawIdentity),
+		RawIdentity: RawState(in.RawIdentity),
 		TypeName:    in.TypeName,
 		Version:     in.Version,
 	}
@@ -131,7 +131,7 @@ func MoveResourceStateRequest(in *tfplugin5.MoveResourceState_Request) *tfprotov
 		SourceState:           RawState(in.SourceState),
 		SourceTypeName:        in.SourceTypeName,
 		TargetTypeName:        in.TargetTypeName,
-		SourceIdentity:        ResourceIdentityData(in.SourceIdentity),
+		SourceIdentity:        RawState(in.SourceIdentity),
 	}
 
 	return resp

tfprotov5/internal/fromproto/raw_identity_test.go

@@ -230,10 +230,10 @@ func TestMoveResourceStateRequest(t *testing.T) {
 		},
 		"SourceIdentity": {
 			in: &tfplugin5.MoveResourceState_Request{
-				SourceIdentity: testTfplugin5ResourceIdentityData(),
+				SourceIdentity: testTfplugin5RawState(t, []byte("{}")),
 			},
 			expected: &tfprotov5.MoveResourceStateRequest{
-				SourceIdentity: testTfprotov5ResourceIdentityData(),
+				SourceIdentity: testTfprotov5RawState(t, []byte("{}")),
 			},
 		},
 	}
@@ -502,10 +502,10 @@ func TestUpgradeResourceIdentityRequest(t *testing.T) {
 		},
 		"RawIdentity": {
 			in: &tfplugin5.UpgradeResourceIdentity_Request{
-				RawIdentity: []byte("{}"),
+				RawIdentity: testTfplugin5RawState(t, []byte("{}")),
 			},
 			expected: &tfprotov5.UpgradeResourceIdentityRequest{
-				RawIdentity: testTfprotov5RawIdentity(t, []byte("{}")),
+				RawIdentity: testTfprotov5RawState(t, []byte("{}")),
 			},
 		},
 		"TypeName": {

tfprotov5/internal/fromproto/resource.go

@@ -634,7 +634,14 @@ message MoveResourceState {
         // The private state of the resource being moved.
         bytes source_private = 6;
 
-        ResourceIdentityData source_identity = 7;
+        // The raw identity of the resource being moved. Only the json field is
+        // populated, as there should be no legacy providers using the flatmap
+        // format that support newly introduced RPCs.
+        RawState source_identity = 7;
+
+        // The identity schema version of the resource type that the resource
+        // is being moved from.
+        int64 source_identity_schema_version = 8;
     }
 
     message Response {
@@ -807,7 +814,7 @@ message UpgradeResourceIdentity {
         // not have access to the identity schema of prior_version, so it's the
         // provider's responsibility to interpret this value using the
         // appropriate older schema. The raw_identity will be json encoded.
-        bytes raw_identity = 3;
+        RawState raw_identity = 3;
     }
     message Response {
         // upgraded_identity returns the upgraded resource identity data

tfprotov5/internal/fromproto/resource_test.go

@@ -145,7 +145,7 @@ type UpgradeResourceIdentityRequest struct {
 	// RawIdentity is the identity state as Terraform sees it right now. See the
 	// documentation for `RawIdentity` for information on how to work with the
 	// data it contains.
-	RawIdentity *RawIdentity
+	RawIdentity *RawState
 }
 
 type UpgradeResourceIdentityResponse struct {
@@ -609,7 +609,12 @@ type MoveResourceStateRequest struct {
 	TargetTypeName string
 
 	// SourceIdentity is the identity of the source resource.
-	SourceIdentity *ResourceIdentityData
+	//
+	// Only the underlying JSON field is populated.
+	SourceIdentity *RawState
+
+	// SourceIdentitySchemaVersion is the version of the source resource state.
+	SourceIdentitySchemaVersion int64
 }
 
 // MoveResourceStateResponse is the response from the provider containing

tfprotov5/internal/tfplugin5/tfplugin5.pb.go

@@ -42,7 +42,7 @@ func UpgradeResourceIdentityRequest(in *tfplugin6.UpgradeResourceIdentity_Reques
 	}
 
 	resp := &tfprotov6.UpgradeResourceIdentityRequest{
-		RawIdentity: RawIdentity(in.RawIdentity),
+		RawIdentity: RawState(in.RawIdentity),
 		TypeName:    in.TypeName,
 		Version:     in.Version,
 	}
@@ -131,7 +131,7 @@ func MoveResourceStateRequest(in *tfplugin6.MoveResourceState_Request) *tfprotov
 		SourceState:           RawState(in.SourceState),
 		SourceTypeName:        in.SourceTypeName,
 		TargetTypeName:        in.TargetTypeName,
-		SourceIdentity:        ResourceIdentityData(in.SourceIdentity),
+		SourceIdentity:        RawState(in.SourceIdentity),
 	}
 
 	return resp