fix: Get externalid from webhook (#177)

apps/event-worker/package.json

@@ -28,7 +28,6 @@
     "ioredis": "^5.4.1",
     "lodash": "^4.17.21",
     "ms": "^2.1.3",
-    "p-retry": "^6.2.0",
     "semver": "^7.6.2",
     "zod": "catalog:"
   },

apps/event-worker/src/github-utils.ts

@@ -1,18 +1,8 @@
 import { createAppAuth } from "@octokit/auth-app";
 import { Octokit } from "@octokit/rest";
 
-import { JobStatus as JStatus } from "@ctrlplane/validators/jobs";
-
 import { env } from "./config.js";
 
-export const convertStatus = (status: string): JStatus => {
-  if (status === "success" || status === "neutral") return JStatus.Completed;
-  if (status === "queued" || status === "requested" || status === "waiting")
-    return JStatus.InProgress;
-  if (status === "timed_out" || status === "stale") return JStatus.Failure;
-  return status as JStatus;
-};
-
 export const getInstallationOctokit = (installationId: number) =>
   env.GITHUB_BOT_APP_ID &&
   env.GITHUB_BOT_PRIVATE_KEY &&

apps/event-worker/src/job-dispatch/github.ts

@@ -1,5 +1,4 @@
 import type { Job } from "@ctrlplane/db/schema";
-import pRetry from "p-retry";
 
 import { and, eq, takeFirstOrNull } from "@ctrlplane/db";
 import { db } from "@ctrlplane/db/client";
@@ -15,7 +14,7 @@ import { logger } from "@ctrlplane/logger";
 import { configSchema } from "@ctrlplane/validators/github";
 import { JobStatus } from "@ctrlplane/validators/jobs";
 
-import { convertStatus, getInstallationOctokit } from "../github-utils.js";
+import { getInstallationOctokit } from "../github-utils.js";
 
 export const dispatchGithubJob = async (je: Job) => {
   logger.info(`Dispatching github job ${je.id}...`);
@@ -100,54 +99,4 @@ export const dispatchGithubJob = async (je: Job) => {
       authorization: `Bearer ${installationToken.token}`,
     },
   });
-
-  let runId: number | null = null;
-  let status: string | null = null;
-
-  try {
-    const { runId: runId_, status: status_ } = await pRetry(
-      async () => {
-        const runs = await octokit.actions.listWorkflowRuns({
-          owner: parsed.data.owner,
-          repo: parsed.data.repo,
-          workflow_id: parsed.data.workflowId,
-          branch: ghOrg.branch,
-        });
-
-        const run = runs.data.workflow_runs.find((run) =>
-          run.name?.includes(je.id),
-        );
-
-        if (run == null) throw new Error("Run not found");
-
-        logger.info(`Run found for job ${je.id}`, { run });
-
-        return { runId: run.id, status: run.status, url: run.html_url };
-      },
-      { retries: 15, minTimeout: 1000 },
-    );
-
-    runId = runId_;
-    status = status_;
-  } catch (error) {
-    logger.error(`Job ${je.id} dispatch to GitHub failed`, { error });
-    await db.update(job).set({
-      status: JobStatus.ExternalRunNotFound,
-      message: `Run ID not found for job ${je.id}`,
-    });
-    return;
-  }
-
-  logger.info(`Job ${je.id} dispatched to GitHub`, {
-    runId,
-    status,
-  });
-
-  await db
-    .update(job)
-    .set({
-      externalId: runId.toString(),
-      status: convertStatus(status ?? JobStatus.InProgress),
-    })
-    .where(eq(job.id, je.id));
 };

apps/webservice/src/app/api/github/webhook/workflow/handler.ts

@@ -21,31 +21,54 @@ const convertStatus = (
 ): schema.JobStatus =>
   status === JobStatus.Completed ? JobStatus.Completed : JobStatus.InProgress;
 
+const extractUuid = (str: string) => {
+  const uuidRegex =
+    /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/;
+  const match = uuidRegex.exec(str);
+  return match ? match[0] : null;
+};
+
+const getJob = async (externalId: number, name: string) => {
+  const jobFromExternalId = await db
+    .select()
+    .from(schema.job)
+    .where(eq(schema.job.externalId, externalId.toString()))
+    .then(takeFirstOrNull);
+
+  if (jobFromExternalId != null) return jobFromExternalId;
+
+  const uuid = extractUuid(name);
+  if (uuid == null) return null;
+
+  return db
+    .select()
+    .from(schema.job)
+    .where(eq(schema.job.id, uuid))
+    .then(takeFirstOrNull);
+};
+
 export const handleWorkflowWebhookEvent = async (event: WorkflowRunEvent) => {
   const {
     id,
     status: externalStatus,
     conclusion,
     repository,
+    name,
   } = event.workflow_run;
 
+  const job = await getJob(id, name);
+  if (job == null) return;
+
   const status =
     conclusion != null
       ? convertConclusion(conclusion)
       : convertStatus(externalStatus);
 
-  const job = await db
+  const externalId = id.toString();
+  await db
     .update(schema.job)
-    .set({ status })
-    .where(eq(schema.job.externalId, id.toString()))
-    .returning()
-    .then(takeFirstOrNull);
-
-  // Addressing a race condition: When the job is created externally on GitHub,
-  // it triggers a webhook event. However, our system hasn't updated the job with
-  // the externalRunId yet, as it depends on the job's instantiation. Therefore,
-  // the first event lacks the run ID, so we skip it and wait for the next event.
-  if (job == null) return;
+    .set({ status, externalId })
+    .where(eq(schema.job.id, job.id));
 
   const existingUrlMetadata = await db
     .select()