@onlineapps/conn-orch-validator 3.1.2 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-validator",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "description": "Validation orchestrator for OA Drive microservices - coordinates validation across all layers (base, infra, orch, business)",
   "main": "src/index.js",
   "bin": {
@@ -29,7 +29,6 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "amqplib": "^0.10.9",
-    "axios": "^1.4.0",
     "joi": "^17.9.0"
   },
   "devDependencies": {

package/src/CookbookTestRunner.js

@@ -3,47 +3,39 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const axios = require('axios');
 const MockMQClient = require('./mocks/MockMQClient');
 const MockRegistry = require('./mocks/MockRegistry');
 const { resolveHeaders } = require('./utils/resolveHeaders');
 
 /**
- * CookbookTestRunner - Executes cookbook tests offline with mocked infrastructure
+ * CookbookTestRunner — executes cookbook tests offline with mocked infrastructure.
  *
- * Dispatch strategy (D5, validator 3.1.0):
- *   - v3 operations.json — operation has a `handler` field ("path#exportName")
- *     → dispatch via `require()` + direct function call. HTTP is not involved.
- *   - legacy operations.json — operation has `endpoint` + `method`
- *     → dispatch via axios HTTP request against serviceUrl. Retained for
- *       backward-compat with any pre-v3 services that still expose /api/v1/*.
- *   - operation with neither `handler` nor `endpoint` → explicit error.
+ * Dispatch is exclusively v3 handler-registry: each operation MUST declare
+ * `handler: "path#exportName"` in operations.json. The runner loads the
+ * module via `require()` and calls `handler(input, ctx)` directly in-process
+ * (no HTTP). Operations without a `handler` field are an explicit error.
  *
- * The v3 handler dispatch builds a minimal real ctx:
+ * The handler dispatch builds a minimal real ctx:
  *   { logger, tenant_id, workspace_id, correlation_id, db: null, cache: null,
- *     httpClient: null, stream: null, abortSignal: null }
- * — matching the shape ServiceWrapper.ContextBuilder produces in production
+ *     httpClient: null, secrets: null, stream: null, abortSignal: null }
+ * matching the shape ServiceWrapper.ContextBuilder produces in production
  * (see api/docs/architecture/biz-service-invocation-model.md §5). Handlers
- * that require DB access import sequelize directly from their own
+ * that need DB access import sequelize directly from their own
  * src/config/database.js module (see standards/biz-service-onboarding.md §9a);
- * connector fields stay null and the handler surfaces its own failure if
+ * connector slots stay null and the handler surfaces its own failure if
  * something it genuinely needs is missing.
  *
- * Supports unified cookbook format for both testing (with expect) and production (without expect)
+ * Supports unified cookbook format for both testing (with expect) and production (without expect).
  */
 class CookbookTestRunner {
   constructor(options = {}) {
     if (!options.serviceName) {
       throw new Error('[CookbookTestRunner] serviceName is required');
     }
-    if (!options.serviceUrl) {
-      throw new Error('[CookbookTestRunner] serviceUrl is required');
-    }
     if (!options.logger || typeof options.logger.warn !== 'function') {
       throw new Error('[CookbookTestRunner] Logger is required — Expected object with warn() method');
     }
     this.serviceName = options.serviceName;
-    this.serviceUrl = options.serviceUrl;
     this.servicePath = options.servicePath;
     this.mockInfrastructure = options.mockInfrastructure !== false;
     this.timeout = options.timeout;
@@ -189,38 +181,31 @@ class CookbookTestRunner {
     };
 
     try {
-      // Resolve operation spec from operations.json — returns either
-      // { dispatchMode: 'handler', modulePath, exportName } (v3) or
-      // { dispatchMode: 'http', path, method, headers } (legacy).
+      // Resolve operation spec from operations.json — always returns
+      // { modulePath, exportName } (v3 handler dispatch is the only mode).
       const spec = await this.resolveOperation(step.service, step.operation);
 
-      const validationTenantId = process.env.OA_VALIDATION_TENANT_ID;
-      const validationWorkspaceId = process.env.OA_VALIDATION_WORKSPACE_ID;
-      if (!validationTenantId || !validationWorkspaceId) {
+      const rawTenantId = process.env.OA_VALIDATION_TENANT_ID;
+      const rawWorkspaceId = process.env.OA_VALIDATION_WORKSPACE_ID;
+      if (!rawTenantId || !rawWorkspaceId) {
         throw new Error('[CookbookTestRunner] Missing required environment variables OA_VALIDATION_TENANT_ID and/or OA_VALIDATION_WORKSPACE_ID');
       }
-
-      if (spec.dispatchMode === 'handler') {
-        await this._dispatchViaHandler({
-          step,
-          spec,
-          testConfig,
-          validationTenantId,
-          validationWorkspaceId,
-          result,
-          startTime
-        });
-      } else {
-        await this._dispatchViaHttp({
-          step,
-          spec,
-          testConfig,
-          validationTenantId,
-          validationWorkspaceId,
-          result,
-          startTime
-        });
-      }
+      // Coerce numeric env vars to integers so ctx matches production
+      // ContextBuilder (which receives already-typed values from the MQ envelope).
+      // Handlers that check `Number.isInteger(ctx.tenant_id)` would otherwise
+      // reject the string form and every workspace-scoped cookbook would fail.
+      const validationTenantId = /^\d+$/.test(rawTenantId) ? parseInt(rawTenantId, 10) : rawTenantId;
+      const validationWorkspaceId = /^\d+$/.test(rawWorkspaceId) ? parseInt(rawWorkspaceId, 10) : rawWorkspaceId;
+
+      await this._dispatchViaHandler({
+        step,
+        spec,
+        testConfig,
+        validationTenantId,
+        validationWorkspaceId,
+        result,
+        startTime
+      });
 
       this.logger.info(`Step ${step.id}: ${result.passed ? 'PASSED' : 'FAILED'} (${result.duration}ms)`);
 
@@ -236,7 +221,7 @@ class CookbookTestRunner {
   }
 
   /**
-   * v3 dispatch: require handler module, build minimal real ctx, call
+   * Handler dispatch: require handler module, build minimal real ctx, call
    * handler(input, ctx). Mirrors the production ContextBuilder shape
    * (see api/docs/architecture/biz-service-invocation-model.md §5) with
    * all connector slots set to null — handlers that need DB access use
@@ -348,47 +333,6 @@ class CookbookTestRunner {
     }
   }
 
-  /**
-   * Legacy dispatch: HTTP request against serviceUrl + endpoint. Retained
-   * verbatim (modulo wrapping) for compatibility with pre-v3 services that
-   * still expose /api/v1/* business routes.
-   */
-  async _dispatchViaHttp({ step, spec, testConfig, validationTenantId, validationWorkspaceId, result, startTime }) {
-    const request = {
-      method: spec.method,
-      url: `${this.serviceUrl}${spec.path}`,
-      data: step.input,
-      timeout: testConfig.timeout || this.timeout,
-      headers: {
-        'x-validation-request': 'true',
-        'x-tenant-id': validationTenantId,
-        'x-workspace-id': validationWorkspaceId,
-        ...resolveHeaders(spec.headers),
-        ...resolveHeaders(step.headers)
-      }
-    };
-    result.request = request;
-
-    const response = await axios(request);
-
-    result.response = {
-      status: response.status,
-      statusText: response.statusText,
-      data: response.data
-    };
-
-    result.actual = response.data;
-    result.duration = Date.now() - startTime;
-
-    if (step.expect) {
-      const validation = this.validateExpectations(step.expect, result);
-      result.passed = validation.passed;
-      result.validationErrors = validation.errors;
-    } else {
-      result.passed = response.status >= 200 && response.status < 300;
-    }
-  }
-
   /**
    * Validate expectations against actual results
    */
@@ -537,16 +481,9 @@ class CookbookTestRunner {
   }
 
   /**
-   * Resolve operation spec from operations.json. Returns a dispatch
-   * descriptor depending on which shape the operation declares:
-   *
-   *   v3 (handler-based, post-2026-04):
-   *     { dispatchMode: 'handler', modulePath, exportName }
-   *
-   *   legacy (HTTP endpoint, pre-v3):
-   *     { dispatchMode: 'http', path, method, headers }
-   *
-   * Throws if the operation declares neither.
+   * Resolve operation spec from operations.json. Returns the handler
+   * dispatch descriptor: { modulePath, exportName, headers }.
+   * Throws if the operation does not declare a v3 `handler`.
    */
   async resolveOperation(serviceName, operationName) {
     const serviceRoot = this._resolveServiceRoot(serviceName);
@@ -565,30 +502,20 @@ class CookbookTestRunner {
       throw new Error(`Operation not found: ${operationName}`);
     }
 
-    if (operation.handler) {
-      const [modRel, exportName] = String(operation.handler).split('#');
-      if (!modRel || !exportName) {
-        throw new Error(`[CookbookTestRunner] Invalid handler spec "${operation.handler}" for ${serviceName}.${operationName}; expected "path#exportName"`);
-      }
-      const modulePath = require.resolve(path.join(serviceRoot, 'src', modRel));
-      return {
-        dispatchMode: 'handler',
-        modulePath,
-        exportName,
-        headers: operation.headers || {}
-      };
+    if (!operation.handler) {
+      throw new Error(`[CookbookTestRunner] Operation ${serviceName}.${operationName} in ${operationsPath} is missing required v3 field "handler" ("path#exportName"). Fix: declare handler in operations.json per RFC §5.3.`);
     }
 
-    if (operation.endpoint && operation.method) {
-      return {
-        dispatchMode: 'http',
-        path: operation.endpoint,
-        method: operation.method,
-        headers: operation.headers || {}
-      };
+    const [modRel, exportName] = String(operation.handler).split('#');
+    if (!modRel || !exportName) {
+      throw new Error(`[CookbookTestRunner] Invalid handler spec "${operation.handler}" for ${serviceName}.${operationName}; expected "path#exportName"`);
     }
-
-    throw new Error(`[CookbookTestRunner] Operation ${serviceName}.${operationName} declares neither "handler" (v3) nor "endpoint"+"method" (legacy) in ${operationsPath}`);
+    const modulePath = require.resolve(path.join(serviceRoot, 'src', modRel));
+    return {
+      modulePath,
+      exportName,
+      headers: operation.headers || {}
+    };
   }
 
   /**

package/src/ServiceReadinessValidator.js

@@ -197,17 +197,26 @@ class ServiceReadinessValidator {
   }
 
   /**
-   * Check health endpoint
+   * Check health endpoint via Node 18+ global fetch (no external HTTP client).
    */
   async checkHealth(healthUrl) {
     try {
-      const axios = require('axios');
-      const response = await axios.get(healthUrl, { timeout: 5000 });
+      const response = await fetch(healthUrl, {
+        method: 'GET',
+        signal: AbortSignal.timeout(5000)
+      });
+
+      let data = null;
+      try {
+        data = await response.json();
+      } catch (_) {
+        // health endpoint may return non-JSON; keep data null and rely on status.
+      }
 
       return {
         passed: response.status === 200,
         status: response.status,
-        data: response.data
+        data
       };
     } catch (error) {
       return {

package/src/ValidationOrchestrator.js

@@ -45,7 +45,6 @@ class ValidationOrchestrator {
     this.cookbookRunner = new CookbookTestRunner({
       servicePath: this.serviceRoot,
       serviceName: this.serviceName,
-      serviceUrl: this.serviceUrl,
       logger: this.logger,
       timeout: 30000
     });
@@ -384,12 +383,10 @@ class ValidationOrchestrator {
   }
 
   /**
-   * Step 4: Run cookbook tests
-   *
-   * v3 note: per-operation HTTP dispatch is retired. If operations.json is v3
-   * (schema_version "3.0" or any operation declares `handler`), cookbook runs
-   * are skipped here with a warning. Handler-registry-based cookbook dispatch
-   * is tracked separately (see RFC §5.3, §5.9).
+   * Step 4: Run cookbook tests via CookbookTestRunner (v3 handler dispatch).
+   * Operations must declare a `handler` in operations.json; the runner
+   * loads the module via `require()` and calls the exported function
+   * in-process. Failures fail this validation step.
    */
   async runCookbookTests() {
     try {
@@ -406,36 +403,6 @@ class ValidationOrchestrator {
         };
       }
 
-      const operationsFile = path.join(this.configPath, 'operations.json');
-      let isV3 = false;
-      try {
-        const ops = JSON.parse(fs.readFileSync(operationsFile, 'utf8'));
-        const opValues = Object.values(ops.operations || {});
-        isV3 = ops.schema_version === '3.0' || opValues.some(o => o && typeof o === 'object' && 'handler' in o);
-      } catch (_) { /* fall through to runner */ }
-
-      if (isV3) {
-        // v3 per-op HTTP dispatch is retired (RFC §5.3). Cookbook HTTP execution
-        // is skipped until CookbookTestRunner gains handler-registry dispatch.
-        // We still report each operation as a structural-validation "test" so
-        // the proof codec's `testsRun > 0` invariant is satisfied — structural
-        // validation of all operations has already passed at Steps 1 and 3.
-        let opCount = 0;
-        try {
-          const ops = JSON.parse(fs.readFileSync(operationsFile, 'utf8'));
-          opCount = Object.keys(ops.operations || {}).length;
-        } catch (_) { opCount = 0; }
-
-        console.warn(`[ValidationOrchestrator] Step 4: cookbook HTTP dispatch is v2-only. Skipping for v3; counting ${opCount} operation structural check(s) as tests.`);
-        return {
-          success: true,
-          total: opCount,
-          passed: opCount,
-          failed: 0,
-          warnings: ['Cookbook HTTP execution skipped — v3 handler-registry dispatch not yet implemented in CookbookTestRunner']
-        };
-      }
-
       const result = await this.cookbookRunner.runCookbooks(cookbooksPath);
 
       console.log(`[ValidationOrchestrator] ✓ Cookbook tests: ${result.passed}/${result.total} passed`);