Skip to content

Commit 3b41caa

Browse files
TonybynMp4claude
andcommitted
fix(gitlab): a GraphQL error fails the merge-message read
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent e8ab108 commit 3b41caa

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

‎packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
decodeAwardEmojiJson,
66
decodeRepositoryBlobsJson,
77
decodeCommitsJson,
8+
decodeMergeMessagesJson,
89
decodeMergeRequestDetailJson,
910
decodeMergeRequestDiffsJson,
1011
decodeMergeRequestListJson,
@@ -790,3 +791,18 @@ describe("decodeMergeRequestStatsJson", () => {
790791
expect(read(2).truncated).toBe(true);
791792
});
792793
});
794+
795+
describe("decodeMergeMessagesJson", () => {
796+
it("fails a partial response instead of reading errored fields as absent templates", () => {
797+
const decoded = decodeMergeMessagesJson(
798+
JSON.stringify({
799+
errors: [{ message: "Internal server error", path: ["project", "mergeRequest"] }],
800+
data: {
801+
project: { mergeRequest: { title: "Add thing", defaultMergeCommitMessage: null } },
802+
},
803+
}),
804+
);
805+
806+
expect(Result.isFailure(decoded)).toBe(true);
807+
});
808+
});

‎packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@ export const MERGE_MESSAGES_GRAPHQL_QUERY = `query($fullPath: ID!, $iid: String!
10041004
}`;
10051005

10061006
const RawMergeMessagesSchema = Schema.Struct({
1007+
// A field that errored reads as null, which must not pass for an absent template.
1008+
errors: Schema.optionalKey(Schema.Never),
10071009
data: Schema.Struct({
10081010
project: Schema.NullOr(
10091011
Schema.Struct({

0 commit comments

Comments
 (0)