Use original error's message for gRPC error

Signed-off-by: Jonny Stoten <jonny.stoten@docker.com>
moby · Jul 26, 2022 · df0c9b6 · df0c9b6
1 parent f4e20ec
commit df0c9b6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/util/grpcerrors/grpcerrors.go b/util/grpcerrors/grpcerrors.go
@@ -42,6 +42,14 @@ func ToGRPC(err error) error {
 		st = status.FromProto(pb)
 	}
 
+	// If the original error was wrapped with more context than the GRPCStatus error,
+	// copy the original message to the GRPCStatus error
+	if err.Error() != st.Message() {
+		pb := st.Proto()
+		pb.Message = err.Error()
+		st = status.FromProto(pb)
+	}
+
 	var details []proto.Message
 
 	for _, st := range stack.Traces(err) {