@norskvideo/ctl-test-harness 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-test-harness",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "type": "module",
   "exports": {
     ".": {

package/smoke.d.ts

@@ -87,7 +87,7 @@ export interface SmokeSpec {
         clearedMs?: number;
     };
     /** Override the banded ports (see smokePorts). */
-    ports?: Partial<BaseHarnessPorts>;
+    ports?: Partial<SmokePorts>;
 }
 /** What the observation kinds read. Injected so the phase rule is tested
  *  without Studio; defaults are studio-state's fetchers. */
@@ -125,6 +125,8 @@ export interface SmokeDeps {
     /** Docker leaves root-owned bind-mount targets under the store; a non-root
      *  runner cannot rm them, so they go from a throwaway root container. */
     nukeStoreAsRoot(storeDir: string): void;
+    /** After the nuke: is the store still there? (Then the nuke did not work.) */
+    storeExists(storeDir: string): boolean;
     ensureNetwork(): ReturnType<typeof ensureRunnerOnNetwork>;
     supportsNoPublish(): Promise<boolean>;
     containerUser(): string | undefined;
@@ -133,7 +135,11 @@ export interface SmokeDeps {
 /** Per-slug port band, above the product integration harnesses' own bands:
  *  daemon, dev backend, published Studio port and an instance base, twenty
  *  apart per slug. */
-export declare function smokePorts(slug: string, overrides?: Partial<BaseHarnessPorts>): BaseHarnessPorts;
+export interface SmokePorts extends BaseHarnessPorts {
+    /** The daemon's oauth2 proxy; banded so co-located runs never meet on :9443. */
+    proxyPort: number;
+}
+export declare function smokePorts(slug: string, overrides?: Partial<SmokePorts>): SmokePorts;
 export declare const defaultSmokeDeps: SmokeDeps;
 /** Whether an observation depends on a source being pumped. Structural ones
  *  run the satisfied phase only. */

package/smoke.js

@@ -18,7 +18,7 @@
 // not a dependency of this package (daemon.ts's cleanupDaemon has the same
 // rule); a product wanting typed commands bridges with toArgv in its own spec.
 import { spawnSync } from "node:child_process";
-import { writeFileSync } from "node:fs";
+import { existsSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 import { ensureRunnerOnNetwork, netReachMode, STUDIO_INTERNAL_PORT, studioBaseFrom, } from "./container-net.js";
 import { cleanupDaemon, requireLicenseFile, runCli, startDaemon, } from "./daemon.js";
@@ -33,15 +33,13 @@ const SMOKE_BAND_WIDTH = 20;
 const SMOKE_BANDS = 50;
 const STUDIO_HOST_PORT_PARAM = "STUDIO_HOST_PORT";
 const NUKE_IMAGE = "alpine:3";
-/** Per-slug port band, above the product integration harnesses' own bands:
- *  daemon, dev backend, published Studio port and an instance base, twenty
- *  apart per slug. */
 export function smokePorts(slug, overrides = {}) {
     const daemonPort = SMOKE_PORT_BASE + hashSlot(`smoke:${slug}`, SMOKE_BANDS) * SMOKE_BAND_WIDTH;
     return {
         daemonPort,
         backendPort: daemonPort + 1,
         studioHostPort: daemonPort + 2,
+        proxyPort: daemonPort + 3,
         instancePortBase: daemonPort + 10,
         ...overrides,
     };
@@ -79,6 +77,7 @@ export const defaultSmokeDeps = {
             `rm -rf /base/${basename(storeDir)}`,
         ]);
     },
+    storeExists: (storeDir) => existsSync(storeDir),
     ensureNetwork: () => ensureRunnerOnNetwork(),
     supportsNoPublish: ctlSupportsNoPublish,
     containerUser: runnerContainerUser,
@@ -188,14 +187,20 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
     let daemon = null;
     let launched = false;
     let handles = [];
+    let journeyError;
     try {
-        // The same zero point as the guides: `init` on a virgin store, not a seeded config.yaml.
+        // The same zero point as the guides: `init` on a virgin store, not a seeded
+        // config.yaml. No http redirect (port 80 needs root) and a banded proxy port
+        // (the default :9443 would meet a co-located integration run).
         await cliOk([
             "init",
             "--network-mode",
             spec.networkMode ?? "docker",
             "--working-directory",
             join(storeDir, "norsk-runtime"),
+            "--proxy-port",
+            String(ports.proxyPort),
+            "--no-http-redirect",
             "--no-start-server",
         ]);
         const started = deps.startDaemon(storeDir, { port: ports.daemonPort, seedConfig: false });
@@ -316,9 +321,15 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
             deps.log(`${slug}: cleared phase passed for ${phased.length} observation(s)`);
         }
     }
-    finally {
-        if (handles.length)
-            await deps.stopSources(handles).catch(() => { });
+    catch (e) {
+        journeyError = e;
+    }
+    if (handles.length)
+        await deps.stopSources(handles).catch(() => { });
+    // cleanupDaemon ends with rmSync(storeDir); Docker's root-owned bind-mount
+    // targets make that EACCES on a non-root runner. Expected: the root nuke
+    // below is what removes them. Only a store that survives the nuke fails.
+    try {
         await deps.cleanup({
             deleteInstance: (id) => cli(["instance", "delete", id, "--purge"]),
             stopDaemon: () => cli(["shutdown", "--daemon-only"]),
@@ -327,6 +338,14 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
             storeDir,
             containers: [`norsk-inst-${instanceId}-studio`, `norsk-inst-${instanceId}-media`],
         });
-        deps.nukeStoreAsRoot(storeDir);
+    }
+    catch (e) {
+        deps.log(`${slug}: cleanup could not remove the store itself (${e instanceof Error ? e.message : String(e)}); nuking as root`);
+    }
+    deps.nukeStoreAsRoot(storeDir);
+    if (journeyError !== undefined)
+        throw journeyError;
+    if (deps.storeExists(storeDir)) {
+        throw new Error(`${slug}: store ${storeDir} still present after the root-container nuke`);
     }
 }