Fixed last test

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

pkg/actors/actors.go

@@ -646,9 +646,9 @@ func (a *actorsRuntime) callLocalActor(ctx context.Context, req *internalv1pb.In
 		return nil, fmt.Errorf("failed to read response data: %w", err)
 	}
 
-	// The .NET SDK indicates Actor failure via a header instead of a bad response.
-	if _, ok := imRes.Headers()["X-Daprerrorresponseheader"]; ok {
-		return res, actorerrors.NewActorError(imRes)
+	// The .NET SDK indicates Actor failure via a header instead of a bad response
+	if _, ok := res.GetHeaders()["X-Daprerrorresponseheader"]; ok {
+		return res, actorerrors.NewActorError(res)
 	}
 
 	return res, nil
@@ -755,12 +755,7 @@ func (a *actorsRuntime) callRemoteActor(
 		return nil, teardown, err
 	}
 	if len(res.GetHeaders()["X-Daprerrorresponseheader"].GetValues()) > 0 {
-		invokeResponse, invokeErr := invokev1.InternalInvokeResponse(res)
-		if invokeErr != nil {
-			return nil, teardown, invokeErr
-		}
-		defer invokeResponse.Close()
-		return res, teardown, actorerrors.NewActorError(invokeResponse)
+		return res, teardown, actorerrors.NewActorError(res)
 	}
 
 	return res, teardown, nil

pkg/actors/errors/actor_error.go

@@ -20,36 +20,33 @@ import (
 	"google.golang.org/grpc/codes"
 
 	invokev1 "github.com/dapr/dapr/pkg/messaging/v1"
+	internalv1pb "github.com/dapr/dapr/pkg/proto/internals/v1"
 )
 
 // ActorError is an error returned by an Actor via a header + body in the method's response.
 type ActorError struct {
 	body        []byte
-	headers     invokev1.DaprInternalMetadata
+	headers     map[string]*internalv1pb.ListStringValue
 	contentType string
 	statusCode  int
 	message     string
 }
 
-func NewActorError(invokeResponse *invokev1.InvokeMethodResponse) error {
-	if invokeResponse == nil {
+func NewActorError(res *internalv1pb.InternalInvokeResponse) error {
+	if res == nil {
 		return fmt.Errorf("could not parse actor error: no response object")
 	}
 
-	body, err := invokeResponse.RawDataFull()
-	if err != nil {
-		return fmt.Errorf("could not read actor error: %s", err)
-	}
-
-	statusCode := int(invokeResponse.Status().GetCode())
-	if !invokeResponse.IsHTTPResponse() {
+	statusCode := int(res.GetStatus().GetCode())
+	if !res.IsHTTPResponse() {
 		statusCode = invokev1.HTTPStatusFromCode(codes.Code(statusCode))
 	}
 
+	msg := res.GetMessage()
 	return &ActorError{
-		body:        body,
-		headers:     invokeResponse.Headers(),
-		contentType: invokeResponse.ContentType(),
+		body:        msg.GetData().GetValue(),
+		headers:     res.GetHeaders(),
+		contentType: msg.GetContentType(),
 		statusCode:  statusCode,
 		message:     "actor error with details in body",
 	}

pkg/grpc/api_daprinternal.go

@@ -284,13 +284,14 @@ func (a *api) CallActor(ctx context.Context, in *internalv1pb.InternalInvokeRequ
 	// We don't do resiliency here as it is handled in the API layer. See InvokeActor().
 	res, err := a.Actors.Call(ctx, in)
 	if err != nil {
-		// We have to remove the error to keep the body, so callers must re-inspect for the header in the actual response.
 		actorErr, isActorErr := actorerrors.As(err)
 		if res != nil && isActorErr {
+			// We have to remove the error to keep the body, so callers must re-inspect for the header in the actual response.
 			res.Message.Data = &anypb.Any{
 				Value: actorErr.Body(),
 			}
 			res.Headers = actorErr.Headers()
+			return res, nil
 		}
 
 		err = status.Errorf(codes.Internal, messages.ErrActorInvoke, err)