@celilo/e2e 0.7.13 → 0.7.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/e2e",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "E2E test infrastructure for Celilo-deployed applications. Provides a simulated internet with DNS hierarchy, ACME server, firewalls, and target machines in Docker.",
   "type": "module",
   "main": "./src/index.ts",
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@celilo/cli-display": "^0.1.9",
-    "@celilo/event-bus": "^0.1.5",
+    "@celilo/event-bus": "^0.1.6",
     "yaml": "^2.8.0",
     "zod": "^3.24.1"
   },

package/src/cli/command-registry.ts

@@ -23,15 +23,21 @@ export interface FlagDef {
 export const COMMANDS: CommandDef[] = [
   {
     name: 'run',
-    description: 'Run e2e tests — pass a module path or pattern, or --all-modules',
+    description: 'Run e2e tests — pass a module path or pattern, or --all / --all-modules',
     flags: [
+      { name: '--all', description: 'Run the full regression: every module suite + top-level e2e/tests/' },
+      { name: '--all-modules', description: 'Run e2e tests for all modules with e2e/ directories' },
       { name: '--keep', description: 'Keep network running after tests' },
       { name: '--reuse', description: 'Reuse existing network if running' },
       { name: '--live', description: 'Use live (non-simulated) internet' },
       { name: '--published', description: 'Use published .netapp packages' },
-      { name: '--all-modules', description: 'Run e2e tests for all modules with e2e/ directories' },
     ],
   },
+  {
+    name: 'list',
+    description: 'List every discoverable Docker e2e test (module + top-level)',
+    flags: [{ name: '--paths', description: 'Also show each test file path' }],
+  },
   {
     name: 'up',
     description: 'Start interactive test network',
@@ -93,7 +99,7 @@ export const COMMANDS: CommandDef[] = [
 
 export const UP_PRESETS = ['--caddy', '--full-stack', '--infrastructure'];
 
-export const RUN_FLAGS = ['--keep', '--reuse', '--live', '--published', '--all-modules'];
+export const RUN_FLAGS = ['--all', '--all-modules', '--keep', '--reuse', '--live', '--published'];
 
 export const DOWN_FLAGS = ['--keep', '--all'];
 

package/src/cli/completion.ts

@@ -56,6 +56,11 @@ export function getCompletions(words: string[], current: number): string[] {
     );
   }
 
+  if (command === 'list' && currentIndex >= 1) {
+    const used = new Set(args.slice(1));
+    return filterSuggestions(['--paths'].filter((f) => !used.has(f)), args[currentIndex] || '');
+  }
+
   if (command === 'completion' && currentIndex === 1) {
     return filterSuggestions(['zsh', 'bash'], args[1] || '');
   }
@@ -108,13 +113,17 @@ _cele2e() {
       case $line[1] in
         run)
           _arguments \\
+            '--all[Run the full regression: every module suite + top-level e2e/tests/]' \\
+            '--all-modules[Run e2e tests for all modules with e2e/ directories]' \\
             '--keep[Keep network running after tests]' \\
             '--reuse[Reuse existing network if running]' \\
             '--live[Use live (non-simulated) internet]' \\
             '--published[Use published .netapp packages]' \\
-            '--all-modules[Run e2e tests for all modules with e2e/ directories]' \\
             '*::test name or module path:_cele2e_run_args'
           ;;
+        list)
+          _arguments '--paths[Also show each test file path]'
+          ;;
         up)
           _arguments '1: :_cele2e_up_presets'
           ;;
@@ -137,7 +146,7 @@ _cele2e() {
         completion)
           _arguments '1: :_cele2e_completion_shells'
           ;;
-        status|load|clear-timing)
+        status|load|clear-timing|list)
           ;;
       esac
       ;;
@@ -147,6 +156,7 @@ _cele2e() {
 _cele2e_commands() {
   local commands=(
     'run:Run e2e tests (pattern filters by test file name)'
+    'list:List every discoverable Docker e2e test (module + top-level)'
     'up:Start interactive test network'
     'down:Tear down running network'
     'build-infra:Rebuild @celilo/e2e Docker images and standard module .netapps'

package/src/cli/index.ts

@@ -16,7 +16,7 @@
  */
 
 import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { existsSync, readFileSync, readdirSync, rmSync } from 'node:fs';
 import { basename, dirname, join, resolve } from 'node:path';
 import { parse as parseYaml } from 'yaml';
 import { runBuild } from './build';
@@ -55,6 +55,53 @@ function detectTestDir(): { stateDir: string; testsPath: string } {
   return { stateDir: cwd, testsPath: join(cwd, 'tests') };
 }
 
+/**
+ * Resolve the repo root to scan for the full e2e suite (`run --all` / `list`).
+ *
+ * The workspace `./cele2e` wrapper cd's into packages/e2e before exec'ing, so
+ * process.cwd() points at the e2e package — useless for module discovery. The
+ * wrapper exports E2E_INVOKE_CWD with the operator's real PWD; we walk up from
+ * there (or process.cwd() as a fallback) to the nearest ancestor that has a
+ * `modules/` directory, which is the infra repo root. This is what makes the
+ * full-regression command immune to the wrapper's internal cd (ISS-0013).
+ */
+function resolveSuiteRoot(): string {
+  const start = resolve(process.env.E2E_INVOKE_CWD || process.cwd());
+  let dir = start;
+  for (;;) {
+    if (existsSync(join(dir, 'modules'))) return dir;
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return start;
+}
+
+/**
+ * Enumerate every discoverable Docker e2e test (all module suites + the repo's
+ * top-level e2e/tests/) as `{ name, file }`, sorted, with module tests first.
+ */
+function discoverSuiteTests(suiteRoot: string): { name: string; file: string; group: string }[] {
+  const out: { name: string; file: string; group: string }[] = [];
+  for (const moduleDir of findAllModules(suiteRoot)) {
+    const tp = join(moduleDir, 'e2e');
+    const testsDir = existsSync(join(moduleDir, 'manifest.yml'))
+      ? resolve(moduleDir, readManifestTestsDir(join(moduleDir, 'manifest.yml')) ?? 'e2e')
+      : tp;
+    if (!existsSync(testsDir)) continue;
+    for (const f of readdirSync(testsDir).filter((f) => f.endsWith('.test.ts')).sort()) {
+      out.push({ name: f.replace(/\.test\.ts$/, ''), file: join(testsDir, f), group: basename(moduleDir) });
+    }
+  }
+  const topLevel = join(suiteRoot, 'e2e', 'tests');
+  if (existsSync(topLevel)) {
+    for (const f of readdirSync(topLevel).filter((f) => f.endsWith('.test.ts')).sort()) {
+      out.push({ name: f.replace(/\.test\.ts$/, ''), file: join(topLevel, f), group: '(top-level)' });
+    }
+  }
+  return out;
+}
+
 function runScript(script: string, args: string[], env?: Record<string, string>): never {
   const result = spawnSync(join(BIN_DIR, script), args, {
     stdio: 'inherit',
@@ -72,6 +119,8 @@ Usage:
 
 Commands:
   run [pattern]     Run e2e tests (pattern filters by test file name)
+  run --all         Run the FULL regression: every module suite + top-level e2e/tests/
+  list              List every discoverable Docker e2e test (module + top-level)
   up [preset]       Start interactive test network
   down              Tear down running network
   build-infra [dirs...] Rebuild Docker images and package all modules as .netapps
@@ -84,6 +133,8 @@ Commands:
   completion <shell> Generate shell completion script (zsh|bash)
 
 Options for \`run\`:
+  --all             Run every module suite AND the top-level e2e/tests/ (full regression)
+  --all-modules     Run every module suite (no top-level tests)
   --keep            Keep network running after tests
   --reuse           Reuse existing network if running
   --live            Use live (non-simulated) internet
@@ -103,6 +154,8 @@ Options for \`build-infra\`:
   --skip-modules    Skip .netapp packaging (only rebuild Docker images)
 
 Examples:
+  cele2e run --all                  # FULL regression: every module suite + top-level e2e/tests/
+  cele2e list                       # enumerate every discoverable Docker e2e test
   cele2e run                        # in a module: run its tests; outside: run all modules' tests
   cele2e run deploy                 # run tests matching "deploy"
   cele2e run caddy-direct-internet  # from modules/, finds the matching module automatically
@@ -130,6 +183,34 @@ if (command === '--get-completions') {
 
 switch (command) {
   case 'run': {
+    // Full-suite modes (ISS-0013). `--all` runs every module suite AND the
+    // repo's top-level e2e/tests/ in one invocation; `--all-modules` runs just
+    // the module suites. Both resolve the repo root via resolveSuiteRoot() so
+    // they work through the `./cele2e` wrapper's cd into packages/e2e.
+    if (args.includes('--all') || args.includes('--all-modules')) {
+      const wantTopLevel = args.includes('--all');
+      const suiteRoot = resolveSuiteRoot();
+      const allModules = findAllModules(suiteRoot);
+      const env: Record<string, string> = {
+        E2E_TEST_DIR: join(suiteRoot, 'e2e'),
+        E2E_MODULE_DIRS: allModules.join('\n'),
+      };
+      const topLevel = join(suiteRoot, 'e2e', 'tests');
+      if (wantTopLevel && existsSync(topLevel)) {
+        env.E2E_TOP_LEVEL_TESTS = topLevel;
+      }
+      if (allModules.length === 0 && !env.E2E_TOP_LEVEL_TESTS) {
+        console.error(`No e2e tests found under ${suiteRoot}`);
+        console.error('Run from the infra repo root (or set E2E_INVOKE_CWD to it).');
+        process.exit(1);
+      }
+      runScript(
+        'e2e-run',
+        args.filter((a) => a !== '--all' && a !== '--all-modules'),
+        env,
+      );
+    }
+
     // Check if any non-flag arg is a module path (has manifest.yml)
     const modulePath = args
       .filter((a) => !a.startsWith('--'))
@@ -180,6 +261,29 @@ switch (command) {
     break;
   }
 
+  case 'list': {
+    // Enumerate every discoverable Docker e2e test (module + top-level) so the
+    // suite is inspectable without reading runner.ts (ISS-0013).
+    const suiteRoot = resolveSuiteRoot();
+    const tests = discoverSuiteTests(suiteRoot);
+    if (tests.length === 0) {
+      console.error(`No e2e tests found under ${suiteRoot}`);
+      console.error('Run from the infra repo root (or set E2E_INVOKE_CWD to it).');
+      process.exit(1);
+    }
+    const wantPaths = args.includes('--paths');
+    let lastGroup = '';
+    for (const t of tests) {
+      if (t.group !== lastGroup) {
+        console.log(`\n${t.group}:`);
+        lastGroup = t.group;
+      }
+      console.log(wantPaths ? `  ${t.name}  ${t.file}` : `  ${t.name}`);
+    }
+    console.log(`\n${tests.length} tests. Run all: cele2e run --all`);
+    process.exit(0);
+  }
+
   case 'up':
     runScript('e2e-up', args);
 

package/src/runner.ts

@@ -58,6 +58,8 @@ function resolveModuleTestsDir(dir: string): string {
 const testsPath = moduleDir
   ? resolveModuleTestsDir(moduleDir)
   : (process.env.E2E_TESTS_PATH ?? join(testDir, 'tests'));
+/** Set by `cele2e run --all` so a module-dirs run ALSO picks up the repo's top-level e2e/tests/. */
+const topLevelTestsPath = process.env.E2E_TOP_LEVEL_TESTS;
 const timingFile = join(testDir, '.e2e-timing.json');
 const persistentFile = join(testDir, '.e2e-persistent.json');
 
@@ -427,6 +429,22 @@ async function main() {
         .map((f) => resolve(tp, f));
       testFiles.push(...files);
     }
+    // `cele2e run --all` sets E2E_MODULE_DIRS (every module) AND
+    // E2E_TOP_LEVEL_TESTS (the repo's top-level e2e/tests/), so one invocation
+    // covers BOTH the module suites and the top-level tests. Without this, the
+    // module branch and the testsPath branch below are mutually exclusive and
+    // no single run can cover everything (ISS-0013).
+    if (topLevelTestsPath) {
+      if (!existsSync(topLevelTestsPath)) {
+        console.error(`${red}No top-level tests directory found at ${topLevelTestsPath}${reset}`);
+        process.exit(1);
+      }
+      const files = readdirSync(topLevelTestsPath)
+        .filter((f) => f.endsWith('.test.ts'))
+        .sort()
+        .map((f) => resolve(topLevelTestsPath, f));
+      testFiles.push(...files);
+    }
   } else {
     if (!existsSync(testsPath)) {
       console.error(`${red}No tests/ directory found at ${testsPath}${reset}`);