Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions apps/api/src/plugins/github/utils/parse-link-metadata.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// An external link's metadata is a JSON string in the database, so a row
// written by an older version, or truncated, is not the caller's fault and
// should not take the webhook delivery down with it. The Gitea handlers already
// warn and carry on with an empty object; this is the same behaviour in one
// place, since the GitHub side needs it in four.
export function parseLinkMetadata(
raw: string | null | undefined,
context: { externalLinkId: string; source: string },
): Record<string, unknown> {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
if (!raw) {
return {};
}

try {
return JSON.parse(raw) as Record<string, unknown>;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
} catch (error) {
Comment thread
qodo-free-for-open-source-projects[bot] marked this conversation as resolved.
console.warn("Failed to parse GitHub external link metadata", {
...context,
metadata: raw,
error,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.

return {};
}
}
10 changes: 5 additions & 5 deletions apps/api/src/plugins/github/webhooks/issue-closed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
findAllIntegrationsByRepo,
updateTaskStatus,
} from "../services/task-service";
import { parseLinkMetadata } from "../utils/parse-link-metadata";
import { resolveTargetStatus } from "../utils/resolve-column";

type IssueClosedPayload = {
Expand Down Expand Up @@ -53,9 +54,10 @@ export async function handleIssueClosed(payload: IssueClosedPayload) {
continue;
}

const existingMetadata = externalLink.metadata
? JSON.parse(externalLink.metadata)
: {};
const existingMetadata = parseLinkMetadata(externalLink.metadata, {
externalLinkId: externalLink.id,
source: "issue_closed",
});

if (existingMetadata.createdFrom === "kaneo") {
continue;
Expand Down Expand Up @@ -90,7 +92,5 @@ export async function handleIssueClosed(payload: IssueClosedPayload) {
state: "closed",
},
});

return;
}
}
8 changes: 5 additions & 3 deletions apps/api/src/plugins/github/webhooks/issue-edited.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { taskTable } from "../../../database/schema";
import { findExternalLink, updateExternalLink } from "../services/link-manager";
import { findAllIntegrationsByRepo } from "../services/task-service";
import { formatTaskDescriptionFromIssue } from "../utils/format";
import { parseLinkMetadata } from "../utils/parse-link-metadata";

type IssueEditedPayload = {
action: string;
Expand Down Expand Up @@ -63,9 +64,10 @@ export async function handleIssueEdited(payload: IssueEditedPayload) {
continue;
}

const metadata = externalLink.metadata
? JSON.parse(externalLink.metadata)
: {};
const metadata = parseLinkMetadata(externalLink.metadata, {
externalLinkId: externalLink.id,
source: "issue_edited",
});

const updateData: Record<string, unknown> = {};
const updatedMetadata = { ...metadata };
Expand Down
13 changes: 9 additions & 4 deletions apps/api/src/plugins/github/webhooks/pull-request-closed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
findTaskById,
updateTaskStatus,
} from "../services/task-service";
import { parseLinkMetadata } from "../utils/parse-link-metadata";
import { resolveTargetStatus } from "../utils/resolve-column";

type PRClosedPayload = {
Expand Down Expand Up @@ -59,9 +60,10 @@ export async function handlePullRequestClosed(payload: PRClosedPayload) {
continue;
}

const existingMetadata = externalLink.metadata
? JSON.parse(externalLink.metadata)
: {};
const existingMetadata = parseLinkMetadata(externalLink.metadata, {
externalLinkId: externalLink.id,
source: "pull_request_closed",
});

await updateExternalLink(externalLink.id, {
metadata: {
Expand All @@ -82,7 +84,10 @@ export async function handlePullRequestClosed(payload: PRClosedPayload) {

const hasOpenPRs = allTaskPRs.some((pr) => {
if (pr.id === externalLink.id) return false;
const metadata = pr.metadata ? JSON.parse(pr.metadata) : {};
const metadata = parseLinkMetadata(pr.metadata, {
externalLinkId: pr.id,
source: "pull_request_closed",
});
return metadata.state === "open";
});

Expand Down
38 changes: 38 additions & 0 deletions tests/api/plugins/github/utils/parse-link-metadata.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { afterEach, describe, expect, it, vi } from "vitest";
import { parseLinkMetadata } from "../../../../../apps/api/src/plugins/github/utils/parse-link-metadata";

const context = { externalLinkId: "link-1", source: "issue_closed" };

afterEach(() => {
vi.restoreAllMocks();
});

describe("parseLinkMetadata", () => {
it("reads a well formed object", () => {
expect(
parseLinkMetadata('{"state":"open","createdFrom":"kaneo"}', context),
).toEqual({
state: "open",
createdFrom: "kaneo",
});
});

it("treats an absent value as no metadata", () => {
expect(parseLinkMetadata(null, context)).toEqual({});
expect(parseLinkMetadata(undefined, context)).toEqual({});
expect(parseLinkMetadata("", context)).toEqual({});
});

it("warns and carries on when the row cannot be parsed", () => {
const warn = vi.spyOn(console, "warn").mockImplementation(() => undefined);

// A row truncated by an older write, which used to throw out of the handler
// and fail the whole webhook delivery.
expect(parseLinkMetadata('{"state":"op', context)).toEqual({});
expect(warn).toHaveBeenCalledOnce();
expect(warn.mock.calls[0][1]).toMatchObject({
externalLinkId: "link-1",
source: "issue_closed",
});
});
});
Loading