tfprotov5+tfprotov6: Include private state in MoveResourceState (#372)

Reference: hashicorp/terraform#34575

To match upstream changes. No changelog is necessary as this is unreleased.

tfprotov5/internal/fromproto/resource.go

@@ -103,6 +103,7 @@ func MoveResourceStateRequest(in *tfplugin5.MoveResourceState_Request) *tfprotov
 	}
 
 	resp := &tfprotov5.MoveResourceStateRequest{
+		SourcePrivate:         in.SourcePrivate,
 		SourceProviderAddress: in.SourceProviderAddress,
 		SourceSchemaVersion:   in.SourceSchemaVersion,
 		SourceState:           RawState(in.SourceState),

tfprotov5/internal/fromproto/resource_test.go

@@ -155,6 +155,14 @@ func TestMoveResourceStateRequest(t *testing.T) {
 			in:       &tfplugin5.MoveResourceState_Request{},
 			expected: &tfprotov5.MoveResourceStateRequest{},
 		},
+		"SourcePrivate": {
+			in: &tfplugin5.MoveResourceState_Request{
+				SourcePrivate: []byte(`{}`),
+			},
+			expected: &tfprotov5.MoveResourceStateRequest{
+				SourcePrivate: []byte(`{}`),
+			},
+		},
 		"SourceProviderAddress": {
 			in: &tfplugin5.MoveResourceState_Request{
 				SourceProviderAddress: "test",

tfprotov5/internal/tfplugin5/tfplugin5.proto

@@ -490,13 +490,20 @@ message MoveResourceState {
 
         // The resource type that the resource is being moved to.
         string target_type_name = 5;
+
+        // The private state of the resource being moved.
+        bytes source_private = 6;
     }
+
     message Response {
         // The state of the resource after it has been moved.
         DynamicValue target_state = 1;
 
         // Any diagnostics that occurred during the move.
         repeated Diagnostic diagnostics = 2;
+
+        // The private state of the resource after it has been moved.
+        bytes target_private = 3;
     }
 }
 

tfprotov5/internal/toproto/resource.go

@@ -133,8 +133,9 @@ func MoveResourceState_Response(in *tfprotov5.MoveResourceStateResponse) *tfplug
 	}
 
 	resp := &tfplugin5.MoveResourceState_Response{
-		Diagnostics: Diagnostics(in.Diagnostics),
-		TargetState: DynamicValue(in.TargetState),
+		Diagnostics:   Diagnostics(in.Diagnostics),
+		TargetPrivate: in.TargetPrivate,
+		TargetState:   DynamicValue(in.TargetState),
 	}
 
 	return resp

tfprotov5/internal/toproto/resource_test.go

@@ -386,6 +386,15 @@ func TestMoveResourceState_Response(t *testing.T) {
 				},
 			},
 		},
+		"TargetPrivate": {
+			in: &tfprotov5.MoveResourceStateResponse{
+				TargetPrivate: []byte(`{}`),
+			},
+			expected: &tfplugin5.MoveResourceState_Response{
+				Diagnostics:   []*tfplugin5.Diagnostic{},
+				TargetPrivate: []byte(`{}`),
+			},
+		},
 		"TargetState": {
 			in: &tfprotov5.MoveResourceStateResponse{
 				TargetState: testTfprotov5DynamicValue(),

tfprotov5/resource.go

@@ -510,6 +510,9 @@ type ImportedResource struct {
 // must have enabled the MoveResourceState server capability to enable these
 // requests.
 type MoveResourceStateRequest struct {
+	// SourcePrivate is the private state of the source resource.
+	SourcePrivate []byte
+
 	// SourceProviderAddress is the address of the provider for the source
 	// resource type.
 	SourceProviderAddress string
@@ -532,6 +535,9 @@ type MoveResourceStateRequest struct {
 // MoveResourceStateResponse is the response from the provider containing
 // the moved state for the given resource.
 type MoveResourceStateResponse struct {
+	// TargetPrivate is the target resource private state after the move.
+	TargetPrivate []byte
+
 	// TargetState is the target resource state after the move.
 	TargetState *DynamicValue
 

tfprotov6/internal/fromproto/resource.go

@@ -103,6 +103,7 @@ func MoveResourceStateRequest(in *tfplugin6.MoveResourceState_Request) *tfprotov
 	}
 
 	resp := &tfprotov6.MoveResourceStateRequest{
+		SourcePrivate:         in.SourcePrivate,
 		SourceProviderAddress: in.SourceProviderAddress,
 		SourceSchemaVersion:   in.SourceSchemaVersion,
 		SourceState:           RawState(in.SourceState),

tfprotov6/internal/fromproto/resource_test.go

@@ -155,6 +155,14 @@ func TestMoveResourceStateRequest(t *testing.T) {
 			in:       &tfplugin6.MoveResourceState_Request{},
 			expected: &tfprotov6.MoveResourceStateRequest{},
 		},
+		"SourcePrivate": {
+			in: &tfplugin6.MoveResourceState_Request{
+				SourcePrivate: []byte(`{}`),
+			},
+			expected: &tfprotov6.MoveResourceStateRequest{
+				SourcePrivate: []byte(`{}`),
+			},
+		},
 		"SourceProviderAddress": {
 			in: &tfplugin6.MoveResourceState_Request{
 				SourceProviderAddress: "test",

tfprotov6/internal/tfplugin6/tfplugin6.proto

@@ -507,13 +507,20 @@ message MoveResourceState {
 
         // The resource type that the resource is being moved to.
         string target_type_name = 5;
+
+        // The private state of the resource being moved.
+        bytes source_private = 6;
     }
+
     message Response {
         // The state of the resource after it has been moved.
         DynamicValue target_state = 1;
 
         // Any diagnostics that occurred during the move.
         repeated Diagnostic diagnostics = 2;
+
+        // The private state of the resource after it has been moved.
+        bytes target_private = 3;
     }
 }
 

tfprotov6/internal/toproto/resource.go

@@ -133,8 +133,9 @@ func MoveResourceState_Response(in *tfprotov6.MoveResourceStateResponse) *tfplug
 	}
 
 	resp := &tfplugin6.MoveResourceState_Response{
-		Diagnostics: Diagnostics(in.Diagnostics),
-		TargetState: DynamicValue(in.TargetState),
+		Diagnostics:   Diagnostics(in.Diagnostics),
+		TargetPrivate: in.TargetPrivate,
+		TargetState:   DynamicValue(in.TargetState),
 	}
 
 	return resp

tfprotov6/internal/toproto/resource_test.go

@@ -386,6 +386,15 @@ func TestMoveResourceState_Response(t *testing.T) {
 				},
 			},
 		},
+		"TargetPrivate": {
+			in: &tfprotov6.MoveResourceStateResponse{
+				TargetPrivate: []byte(`{}`),
+			},
+			expected: &tfplugin6.MoveResourceState_Response{
+				Diagnostics:   []*tfplugin6.Diagnostic{},
+				TargetPrivate: []byte(`{}`),
+			},
+		},
 		"TargetState": {
 			in: &tfprotov6.MoveResourceStateResponse{
 				TargetState: testTfprotov6DynamicValue(),

tfprotov6/resource.go

@@ -507,6 +507,9 @@ type ImportedResource struct {
 // must have enabled the MoveResourceState server capability to enable these
 // requests.
 type MoveResourceStateRequest struct {
+	// SourcePrivate is the private state of the source resource.
+	SourcePrivate []byte
+
 	// SourceProviderAddress is the address of the provider for the source
 	// resource type.
 	SourceProviderAddress string
@@ -529,6 +532,9 @@ type MoveResourceStateRequest struct {
 // MoveResourceStateResponse is the response from the provider containing
 // the moved state for the given resource.
 type MoveResourceStateResponse struct {
+	// TargetPrivate is the target resource private state after the move.
+	TargetPrivate []byte
+
 	// TargetState is the target resource state after the move.
 	TargetState *DynamicValue