refactor job policy checker app

.coderabbit.yaml

@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+language: en-US
+
+reviews:
+  poem: false

.github/workflows/apps-job-policy-checker.yaml → .github/workflows/apps-jobs.yaml

@@ -1,21 +1,21 @@
-name: Apps / Job Policy Checker
+name: Apps / Jobs
 
 on:
   pull_request:
     branches: ["*"]
     paths:
-      - apps/job-policy-checker/**
+      - apps/jobs/**
       - packages/job-dispatch/**
       - packages/db/**
-      - .github/workflows/apps-job-policy-checker.yaml
+      - .github/workflows/apps-jobs.yaml
       - pnpm-lock.yaml
   push:
     branches: ["main"]
     paths:
-      - apps/job-policy-checker/**
+      - apps/jobs/**
       - packages/job-dispatch/**
       - packages/db/**
-      - .github/workflows/apps-job-policy-checker.yaml
+      - .github/workflows/apps-jobs.yaml
       - pnpm-lock.yaml
 
 jobs:
@@ -58,7 +58,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ctrlplane/job-policy-checker
+          images: ctrlplane/jobs
           tags: |
             type=sha,format=short,prefix=
 
@@ -67,7 +67,7 @@ jobs:
         if: github.ref != 'refs/heads/main'
         with:
           push: false
-          file: apps/job-policy-checker/Dockerfile
+          file: apps/jobs/Dockerfile
           platforms: ${{ matrix.platform }}
           tags: ${{ steps.meta.outputs.tags }}
 
@@ -76,6 +76,6 @@ jobs:
         if: github.ref == 'refs/heads/main' && env.DOCKERHUB_LOGIN == 'true'
         with:
           push: true
-          file: apps/job-policy-checker/Dockerfile
+          file: apps/jobs/Dockerfile
           platforms: ${{ matrix.platform }}
           tags: ${{ steps.meta.outputs.tags }}

apps/docs/pages/self-hosted/services/_meta.ts

@@ -1,5 +1,5 @@
 export default {
   webservice: "Webservice",
   "event-worker": "Event Worker",
-  "job-policy-checker": "Job Policy Checker",
+  jobs: "Jobs Runner",
 };

apps/job-policy-checker/Dockerfile → apps/jobs/Dockerfile

@@ -27,18 +27,20 @@ COPY packages/validators/package.json ./packages/validators/package.json
 COPY packages/logger/package.json ./packages/logger/package.json
 COPY packages/job-dispatch/package.json ./packages/job-dispatch/package.json
 
-COPY apps/job-policy-checker/package.json ./apps/job-policy-checker/package.json
+COPY apps/jobs/package.json ./apps/jobs/package.json
 
 RUN pnpm install --frozen-lockfile
 
 COPY . .
 
-RUN turbo build --filter=...@ctrlplane/job-policy-checker
+RUN turbo build --filter=...@ctrlplane/jobs
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nodejs
 USER nodejs
 
 ENV NODE_ENV=production
 
-CMD ["node", "apps/job-policy-checker/dist/index.js"]
+WORKDIR apps/jobs/dist/
+
+CMD ["node", "index.js"]

apps/job-policy-checker/package.json → apps/jobs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@ctrlplane/job-policy-checker",
+  "name": "@ctrlplane/jobs",
   "version": "0.1.0",
   "private": true,
   "type": "module",
@@ -15,8 +15,8 @@
   "dependencies": {
     "@ctrlplane/db": "workspace:*",
     "@ctrlplane/job-dispatch": "workspace:*",
+    "@ctrlplane/logger": "workspace:*",
     "@ctrlplane/validators": "workspace:*",
-    "@t3-oss/env-core": "catalog:",
     "cron": "^3.1.7",
     "zod": "catalog:"
   },

apps/jobs/src/index.ts

@@ -0,0 +1,100 @@
+// Examples:
+//
+// Run specific jobs with default schedules:
+// node index.js -j policy-checker
+//
+// Run jobs with policy-checker running every 5 minutes:
+// node index.js -j "policy-checker=*/5 * * * *"
+//
+// Run all jobs once:
+// node index.js -r
+
+import { parseArgs } from "node:util";
+import { CronJob } from "cron";
+import { z } from "zod";
+
+import { logger } from "@ctrlplane/logger";
+
+import { run as jobPolicyChecker } from "./policy-checker/index.js";
+
+const jobs: Record<string, { run: () => Promise<void>; schedule: string }> = {
+  "policy-checker": {
+    run: jobPolicyChecker,
+    schedule: "* * * * *", // Default: Every minute
+  },
+};
+
+const jobSchema = z.object({
+  job: z.array(z.string()).optional(),
+  runOnce: z.boolean().optional(),
+});
+
+const parseJobArgs = () => {
+  const { values } = parseArgs({
+    options: {
+      job: {
+        type: "string",
+        short: "j",
+        multiple: true,
+      },
+      runOnce: {
+        type: "boolean",
+        short: "r",
+      },
+    },
+  });
+  return jobSchema.parse(values);
+};
+
+const getJobConfig = (jobName: string) => {
+  const [job, schedule] = jobName.split("=");
+  const jobConfig = jobs[job ?? ""];
+  if (jobConfig == null)
+    throw new Error(`Job ${job} not found in configuration`);
+  return { job, schedule: schedule ?? jobConfig.schedule };
+};
+
+const parseJobSchedulePairs = (parsedValues: z.infer<typeof jobSchema>) => {
+  if (parsedValues.job != null && parsedValues.job.length > 0)
+    return parsedValues.job.map(getJobConfig);
+
+  return Object.entries(jobs).map(([job, config]) => ({
+    job,
+    schedule: config.schedule,
+  }));
+};
+
+const runJob = async (job: string) => {
+  logger.info(`Running job: ${job}`);
+  try {
+    await jobs[job]?.run();
+    logger.info(`Job ${job} completed successfully`);
+  } catch (error: any) {
+    logger.error(`Error running job ${job}: ${error.message}`, error);
+  }
+};
+const main = () => {
+  const parsedValues = parseJobArgs();
+  const jobSchedulePairs = parseJobSchedulePairs(parsedValues);
+
+  logger.info(
+    `Starting jobs: ${jobSchedulePairs.map((pair) => pair.job).join(", ")}`,
+  );
+
+  for (const { job, schedule } of jobSchedulePairs) {
+    if (job == null) continue;
+
+    if (parsedValues.runOnce) {
+      logger.info(`Running job ${job} once`);
+      runJob(job);
+      continue;
+    }
+    const cronJob = new CronJob(schedule, () => runJob(job));
+
+    cronJob.start();
+    logger.info(`Scheduled job ${job} with cron: ${schedule}`);
+    runJob(job);
+  }
+};
+
+main();

apps/job-policy-checker/src/index.ts → apps/jobs/src/policy-checker/index.ts

@@ -1,5 +1,3 @@
-import { CronJob } from "cron";
-
 import { eq } from "@ctrlplane/db";
 import { db } from "@ctrlplane/db/client";
 import * as schema from "@ctrlplane/db/schema";
@@ -10,9 +8,7 @@ import {
 } from "@ctrlplane/job-dispatch";
 import { JobStatus } from "@ctrlplane/validators/jobs";
 
-import { env } from "./config.js";
-
-const run = async () => {
+export const run = async () => {
   const releaseJobTriggers = await db
     .select()
     .from(schema.releaseJobTrigger)
@@ -31,11 +27,3 @@ const run = async () => {
     .then(cancelOldReleaseJobTriggersOnJobDispatch)
     .dispatch();
 };
-
-const releaseJobTriggerPolicyChecker = new CronJob(env.CRON_TIME, run);
-
-console.log("Starting job config policy checker cronjob");
-
-run().catch(console.error);
-
-if (env.CRON_ENABLED) releaseJobTriggerPolicyChecker.start();

docker-compose.yaml

@@ -53,10 +53,10 @@ services:
     ports:
       - "8080:8080"
 
-  job-policy-checker:
+  jobs:
     platform: linux/amd64
-    image: ctrlplane/job-policy-checker:c656deb
-    container_name: ctrlplane-job-policy-checker
+    image: ctrlplane/jobs:c656deb
+    container_name: ctrlplane-jobs
     environment:
       POSTGRES_URL: postgres://ctrlplane:ctrlplane@postgres:5432/ctrlplane
     depends_on: