Skip to content
This repository was archived by the owner on Jul 1, 2024. It is now read-only.

Commit a64d1a5

Browse files
committed
sdk/evaluateBatch: pass server error along on errors in fallback mode
Signed-off-by: Stephan Renatus <[email protected]>
1 parent 66c395c commit a64d1a5

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/opaclient.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,8 @@ export class OPAClient {
197197
} catch (err) {
198198
if (err instanceof ServerError_) {
199199
responses[k] = {
200-
...err,
201-
message:
202-
err.errors?.map(({ message }) => message).join(", ") ||
203-
err.message,
200+
...err.data$,
201+
httpStatusCode: "500",
204202
};
205203
} else {
206204
throw err;

tests/authorizer.test.ts

+13-8
Original file line numberDiff line numberDiff line change
@@ -525,12 +525,18 @@ allow if {
525525
two: {
526526
code: "internal_error",
527527
httpStatusCode: "500",
528-
message: "object keys must be unique",
529-
location: {
530-
col: 1,
531-
file: "condfail",
532-
row: 3,
533-
},
528+
message: "error(s) occurred while evaluating query",
529+
errors: [
530+
{
531+
code: "eval_conflict_error",
532+
message: "object keys must be unique",
533+
location: {
534+
col: 1,
535+
file: "condfail",
536+
row: 3,
537+
},
538+
},
539+
],
534540
},
535541
});
536542
});
@@ -555,8 +561,7 @@ allow if {
555561
},
556562
),
557563
{
558-
name: "ServerError",
559-
message: "object keys must be unique",
564+
message: "error(s) occurred while evaluating query",
560565
},
561566
);
562567
});

0 commit comments

Comments
 (0)