@shipfox/api-runners 5.0.0 → 7.0.1

package/test/factories/provisioner-token.ts

@@ -15,7 +15,8 @@ export const provisionerTokenFactory = Factory.define<
 
   onCreate((token) => {
     return createProvisionerToken({
-      workspaceId: token.workspaceId,
+      scope: token.scope,
+      workspaceId: token.scope === 'workspace' ? token.workspaceId : undefined,
       hashedToken: token.hashedToken,
       prefix: token.prefix,
       name: token.name ?? undefined,
@@ -26,6 +27,7 @@ export const provisionerTokenFactory = Factory.define<
 
   return {
     id: crypto.randomUUID(),
+    scope: 'workspace',
     workspaceId: crypto.randomUUID(),
     hashedToken: hashOpaqueToken(rawToken),
     prefix: extractDisplayPrefix(rawToken),

package/test/factories/runner-instance.ts

@@ -0,0 +1,57 @@
+import {Factory} from 'fishery';
+import type {RunnerInstance} from '#core/entities/runner-instance.js';
+import {db} from '#db/db.js';
+import {providerRunners, toRunnerInstance} from '#db/schema/runner-instances.js';
+
+export const providerRunnerFactory = Factory.define<RunnerInstance>(({onCreate}) => {
+  onCreate(async (providerRunner) => {
+    const [row] = await db()
+      .insert(providerRunners)
+      .values({
+        workspaceId: providerRunner.workspaceId,
+        provisionerId: providerRunner.provisionerId,
+        providerRunnerId: providerRunner.providerRunnerId,
+        reservationId: providerRunner.reservationId,
+        templateKey: providerRunner.templateKey,
+        labels: providerRunner.labels,
+        state: providerRunner.state,
+        reason: providerRunner.reason,
+        runnerSessionId: providerRunner.runnerSessionId,
+        providerKind: providerRunner.providerKind,
+        reportedAt: providerRunner.reportedAt,
+        startedAt: providerRunner.startedAt,
+        stoppingAt: providerRunner.stoppingAt,
+        stoppedAt: providerRunner.stoppedAt,
+        failedAt: providerRunner.failedAt,
+        terminatedAt: providerRunner.terminatedAt,
+        reservationReleasedAt: providerRunner.reservationReleasedAt,
+      })
+      .returning();
+
+    if (!row) throw new Error('Insert returned no rows');
+    return toRunnerInstance(row);
+  });
+
+  return {
+    id: crypto.randomUUID(),
+    workspaceId: crypto.randomUUID(),
+    provisionerId: crypto.randomUUID(),
+    providerRunnerId: crypto.randomUUID(),
+    reservationId: null,
+    templateKey: 'linux',
+    labels: ['linux'],
+    state: 'running',
+    reason: null,
+    runnerSessionId: null,
+    providerKind: 'docker',
+    reportedAt: new Date(),
+    startedAt: null,
+    stoppingAt: null,
+    stoppedAt: null,
+    failedAt: null,
+    terminatedAt: null,
+    reservationReleasedAt: null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+});

package/test/factories/runner-session.ts

@@ -19,13 +19,15 @@ export const runnerSessionFactory = Factory.define<RunnerSession>(({onCreate}) =
     scope: 'workspace',
     registrationTokenId: crypto.randomUUID(),
     registrationTokenKind: 'manual',
+    runnerInstanceId: null,
     provisionerId: null,
-    provisionedRunnerId: null,
+    providerRunnerId: null,
     labels: ['linux', 'x64'],
     toolCapabilities: null,
     toolCapabilitiesReportedAt: null,
     maxClaims: null,
     claimsUsed: 0,
+    revokedAt: null,
     createdAt: new Date(),
     updatedAt: new Date(),
   };

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

@@ -0,0 +1,30 @@
+import {JOB_LEASE_TOKEN_AUDIENCE, RUNNER_SESSION_TOKEN_AUDIENCE} from '@shipfox/api-auth-dto';
+import type {AuthInterModuleClient} from '@shipfox/api-auth-dto/inter-module';
+import {jobLeaseTokenKey, runnerSessionTokenKey} from '@shipfox/node-auth-root-key';
+import {signHs256} from '@shipfox/node-jwt';
+
+const leaseSecret = jobLeaseTokenKey();
+const runnerSessionSecret = runnerSessionTokenKey();
+
+export const runnersTestAuthClient: AuthInterModuleClient = {
+  async mintRunnerSessionToken(claims) {
+    return {
+      token: await signHs256({
+        payload: claims,
+        secret: runnerSessionSecret,
+        expiresIn: '1h',
+        audience: RUNNER_SESSION_TOKEN_AUDIENCE,
+      }),
+    };
+  },
+  async mintJobLeaseToken(claims) {
+    return {
+      token: await signHs256({
+        payload: claims,
+        secret: leaseSecret,
+        expiresIn: '90m',
+        audience: JOB_LEASE_TOKEN_AUDIENCE,
+      }),
+    };
+  },
+};

package/test/globalSetup.ts

@@ -8,9 +8,12 @@ export async function setup() {
   createPostgresClient();
 
   await runMigrations(db(), migrationsPath, '__drizzle_migrations_runners');
-  await db().execute(sql`TRUNCATE runners_provisioned_runners, runners_reservations CASCADE`);
+  await db().execute(sql`TRUNCATE runners_provisioner_capability_snapshots CASCADE`);
+  await db().execute(sql`TRUNCATE runners_runner_instances, runners_reservations CASCADE`);
   await db().execute(sql`TRUNCATE runners_provisioner_tokens CASCADE`);
   await db().execute(sql`TRUNCATE runners_ephemeral_registration_tokens CASCADE`);
+  await db().execute(sql`TRUNCATE runners_runner_bootstrap_tokens CASCADE`);
+  await db().execute(sql`TRUNCATE runners_runner_control_sessions CASCADE`);
   await db().execute(sql`TRUNCATE runners_runner_sessions CASCADE`);
   await db().execute(sql`TRUNCATE runners_rate_limits CASCADE`);
   await db().execute(sql`TRUNCATE runners_manual_registration_tokens CASCADE`);

package/test/index.ts

@@ -7,10 +7,11 @@ export {
   manualRegistrationTokenFactory,
 } from './factories/manual-registration-token.js';
 export {pendingJobFactory} from './factories/pending-job.js';
-export {provisionedRunnerFactory} from './factories/provisioned-runner.js';
 export {
   type ProvisionerTokenFactoryTransientParams,
   provisionerTokenFactory,
 } from './factories/provisioner-token.js';
 export {reservationFactory} from './factories/reservation.js';
+export {providerRunnerFactory} from './factories/runner-instance.js';
 export {runnerSessionFactory} from './factories/runner-session.js';
+export {runnersTestAuthClient} from './fixtures/auth-inter-module.js';