Fixing the pipeline

Author: rainkwan

internal/fwserver/server_moveresourcestate.go

@@ -226,6 +226,16 @@ func (s *Server) MoveResourceState(ctx context.Context, req *MoveResourceStateRe
 			return
 		}
 
+		if resp.TargetIdentity != nil && req.IdentitySchema == nil {
+			resp.Diagnostics.AddError(
+				"Unexpected Move State Response",
+				"An unexpected error was encountered when creating the move state response. New identity data was returned by the provider move state operation, but the resource does not indicate identity support.\n\n"+
+					"This is always a problem with the provider and should be reported to the provider developer.",
+			)
+
+			return
+		}
+
 		// Set any write-only attributes in the move resource state to null
 		modifiedState, err := tftypes.Transform(moveStateResp.TargetState.Raw, NullifyWriteOnlyAttributes(ctx, moveStateResp.TargetState.Schema))
 		if err != nil {

internal/fwserver/server_moveresourcestate_test.go

@@ -961,12 +961,19 @@ func TestServerMoveResourceState(t *testing.T) {
 				TargetTypeName:       "test_resource",
 			},
 			expectedResponse: &fwserver.MoveResourceStateResponse{
-				Diagnostics: diag.Diagnostics{
-					diag.NewErrorDiagnostic(
-						"Unexpected Move State Response",
-						"An unexpected error was encountered when creating the move state response. Identity data was returned by the provider move state operation, but the resource does not indicate identity support.\n\n"+
-							"This is always a problem with the provider and should be reported to the provider developer.",
-					),
+				TargetState: &tfsdk.State{
+					Raw: tftypes.NewValue(schemaType, map[string]tftypes.Value{
+						"id":                 tftypes.NewValue(tftypes.String, "test-id-value"),
+						"optional_attribute": tftypes.NewValue(tftypes.String, nil),
+						"required_attribute": tftypes.NewValue(tftypes.String, "true"),
+					}),
+					Schema: testSchema,
+				},
+				TargetIdentity: &tfsdk.ResourceIdentity{
+					Raw: tftypes.NewValue(schemaIdentityType, map[string]tftypes.Value{
+						"test_id": tftypes.NewValue(tftypes.String, "should-not-be-set"),
+					}),
+					Schema: testIdentitySchema,
 				},
 				TargetPrivate: privatestate.EmptyData(ctx),
 			},