@shipfox/api-workflows 7.1.0 → 9.0.1

package/test/fixtures/runners-inter-module.ts

@@ -1,52 +1,44 @@
-import {runnerToolCapabilitiesSchema} from '@shipfox/api-runners-dto';
 import type {RunnersInterModuleClient} from '@shipfox/api-runners-dto/inter-module';
-import {sql} from 'drizzle-orm';
-import {db} from '#db/db.js';
+
+const activeLeases = new Set<string>();
+const toolCapabilities = new Map<
+  string,
+  Awaited<ReturnType<RunnersInterModuleClient['getEffectiveRunnerToolCapabilities']>>
+>();
+
+function leaseKey(params: {
+  jobId: string;
+  jobExecutionId: string;
+  runnerSessionId: string;
+}): string {
+  return `${params.jobId}:${params.jobExecutionId}:${params.runnerSessionId}`;
+}
+
+export function registerActiveRunnerLease(params: {
+  jobId: string;
+  jobExecutionId: string;
+  runnerSessionId: string;
+}): void {
+  activeLeases.add(leaseKey(params));
+}
+
+export function setRunnerToolCapabilities(
+  runnerSessionId: string,
+  capabilities: Awaited<ReturnType<RunnersInterModuleClient['getEffectiveRunnerToolCapabilities']>>,
+): void {
+  toolCapabilities.set(runnerSessionId, capabilities);
+}
+
+export function resetRunnersTestClient(): void {
+  activeLeases.clear();
+  toolCapabilities.clear();
+}
 
 export const runnersTestClient: RunnersInterModuleClient = {
-  enqueueJobExecution() {
-    return Promise.resolve({});
-  },
-  releaseJobExecution() {
-    return Promise.resolve({});
-  },
-  cancelJobs() {
-    return Promise.resolve({});
-  },
-  async getLeaseState({jobId, jobExecutionId, runnerSessionId}) {
-    const result = await db().execute<{active: boolean}>(sql`
-      SELECT EXISTS(
-        SELECT 1
-        FROM runners_running_jobs
-        WHERE job_id = ${jobId}
-          AND job_execution_id = ${jobExecutionId}
-          AND runner_session_id = ${runnerSessionId}
-      ) AS active
-    `);
-    return {active: result.rows[0]?.active ?? false};
-  },
-  async getEffectiveRunnerToolCapabilities({runnerSessionId}) {
-    const result = await db().execute<{
-      toolCapabilities: unknown;
-      toolCapabilitiesReportedAt: Date | string | null;
-    }>(sql`
-      SELECT
-        tool_capabilities AS "toolCapabilities",
-        tool_capabilities_reported_at AS "toolCapabilitiesReportedAt"
-      FROM runners_runner_sessions
-      WHERE id = ${runnerSessionId}
-    `);
-    const row = result.rows[0];
-    const reportedAt = row?.toolCapabilitiesReportedAt;
-    const reportFresh =
-      reportedAt !== null &&
-      reportedAt !== undefined &&
-      Date.now() - new Date(reportedAt).getTime() <= 60_000;
-    return {
-      capabilities: reportFresh
-        ? runnerToolCapabilitiesSchema.parse(row?.toolCapabilities ?? {harnesses: {}})
-        : {harnesses: {}},
-      reportFresh,
-    };
-  },
+  enqueueJobExecution: async () => ({}),
+  releaseJobExecution: async () => ({}),
+  cancelJobs: async () => ({}),
+  getLeaseState: async (params) => ({active: activeLeases.has(leaseKey(params))}),
+  getEffectiveRunnerToolCapabilities: async ({runnerSessionId}) =>
+    toolCapabilities.get(runnerSessionId) ?? {capabilities: {harnesses: {}}, reportFresh: false},
 };

package/test/globalSetup.ts

@@ -1,8 +1,4 @@
 import './env.js';
-import {annotationsModule} from '@shipfox/annotations';
-import {createAgentModule} from '@shipfox/api-agent';
-import type {AuthInterModuleClient} from '@shipfox/api-auth-dto/inter-module';
-import {createRunnersModule} from '@shipfox/api-runners';
 import {runMigrations} from '@shipfox/node-drizzle';
 import {closePostgresClient, createPostgresClient} from '@shipfox/node-postgres';
 import {sql} from 'drizzle-orm';
@@ -10,44 +6,10 @@ import {closeDb, db, migrationsPath} from '#db/index.js';
 
 export async function setup() {
   createPostgresClient();
-  const runnersModule = createRunnersModule({auth: {} as AuthInterModuleClient});
-
-  const agentModule = createAgentModule({
-    secrets: {
-      deleteSecrets: async () => ({deleted: 0}),
-      getSecretsByNamespace: async () => ({values: {}}),
-      setSecrets: async () => ({}),
-    },
-  });
-  if (!agentModule.database || Array.isArray(agentModule.database)) {
-    throw new Error('Agent module database is not configured');
-  }
-  await runMigrations(
-    agentModule.database.db(),
-    agentModule.database.migrationsPath,
-    '__drizzle_migrations_agent',
-  );
-  if (!runnersModule.database || Array.isArray(runnersModule.database)) {
-    throw new Error('Runners module database is not configured');
-  }
-  await runMigrations(
-    runnersModule.database.db(),
-    runnersModule.database.migrationsPath,
-    '__drizzle_migrations_runners',
-  );
-  if (!annotationsModule.database || Array.isArray(annotationsModule.database)) {
-    throw new Error('Annotations module database is not configured');
-  }
-  await runMigrations(
-    annotationsModule.database.db(),
-    annotationsModule.database.migrationsPath,
-    '__drizzle_migrations_annotations',
-  );
   await runMigrations(db(), migrationsPath, '__drizzle_migrations_workflows');
   await db().execute(sql`TRUNCATE workflows_workflow_runs CASCADE`);
   await db().execute(sql`TRUNCATE workflows_job_listener_events CASCADE`);
   await db().execute(sql`TRUNCATE workflows_outbox CASCADE`);
-  await db().execute(sql`TRUNCATE annotations_annotations CASCADE`);
 
   closeDb();
   await closePostgresClient();

package/test/setup.ts

@@ -2,6 +2,7 @@ import './env.js';
 import {closePostgresClient, createPostgresClient} from '@shipfox/node-postgres';
 import {afterAll, afterEach, beforeAll, vi} from '@shipfox/vitest/vi';
 import {closeDb} from '#db/index.js';
+import {resetRunnersTestClient} from '#test/fixtures/runners-inter-module.js';
 
 beforeAll(() => {
   createPostgresClient();
@@ -9,6 +10,7 @@ beforeAll(() => {
 
 afterEach(() => {
   vi.restoreAllMocks();
+  resetRunnersTestClient();
 });
 
 afterAll(async () => {