@onlineapps/conn-orch-validator 2.0.30 → 2.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-validator",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "Validation orchestrator for OA Drive microservices - coordinates validation across all layers (base, infra, orch, business)",
   "main": "src/index.js",
   "scripts": {

package/src/CookbookTestRunner.js

@@ -364,13 +364,16 @@ class CookbookTestRunner {
    * Resolve operation to HTTP endpoint
    */
   async resolveOperation(serviceName, operationName) {
-    // Load operations.json from service path
-    const operationsPath = this.servicePath
-      ? path.join(this.servicePath, 'conn-config', 'operations.json')
-      : null;
+    // Load operations.json — prefer config/service/, fall back to conn-config/
+    let operationsPath = null;
+    if (this.servicePath) {
+      const newPath = path.join(this.servicePath, 'config', 'service', 'operations.json');
+      const legacyPath = path.join(this.servicePath, 'conn-config', 'operations.json');
+      operationsPath = fs.existsSync(newPath) ? newPath : (fs.existsSync(legacyPath) ? legacyPath : null);
+    }
 
-    if (!operationsPath || !fs.existsSync(operationsPath)) {
-      throw new Error(`Operations file not found for service: ${serviceName}`);
+    if (!operationsPath) {
+      throw new Error(`Operations file not found for service: ${serviceName} (checked config/service/ and conn-config/)`);
     }
 
     const operations = JSON.parse(fs.readFileSync(operationsPath, 'utf8'));

package/src/ServiceReadinessValidator.js

@@ -238,8 +238,9 @@ class ServiceReadinessValidator {
           validateStatus: () => true // Accept any status for validation
         });
 
-        // Check response
-        const isValid = response.status >= 200 && response.status < 300;
+        // Check response: 2xx = success, 4xx = endpoint works but rejected test data (valid)
+        // Only 5xx (server error) or connection failure = invalid endpoint
+        const isValid = response.status < 500;
 
         if (isValid) {
           results.successful++;

package/src/ValidationOrchestrator.js

@@ -29,8 +29,11 @@ class ValidationOrchestrator {
       throw new Error('serviceUrl is required for ValidationOrchestrator');
     }
 
-    // Paths
-    this.configPath = path.join(this.serviceRoot, 'conn-config');
+    // Paths — prefer new config/service/ layout, fall back to legacy conn-config/
+    const newConfigDir = path.join(this.serviceRoot, 'config', 'service');
+    const legacyConfigDir = path.join(this.serviceRoot, 'conn-config');
+    this.configPath = fs.existsSync(newConfigDir) ? newConfigDir : legacyConfigDir;
+
     this.runtimePath = path.join(this.serviceRoot, 'conn-runtime');
     this.proofPath = path.join(this.runtimePath, 'validation-proof.json');
 

package/src/helpers/createPreValidationTests.js

@@ -69,9 +69,14 @@ function createPreValidationTests(testsDir, options = {}) {
     );
   }
 
-  // Load configuration
-  const configPath = path.join(serviceRoot, 'conn-config/config.json');
-  const operationsPath = path.join(serviceRoot, 'conn-config/operations.json');
+  // Load configuration — prefer config/service/, fall back to conn-config/
+  const resolveConfig = (filename) => {
+    const newPath = path.join(serviceRoot, 'config', 'service', filename);
+    const legacyPath = path.join(serviceRoot, 'conn-config', filename);
+    return fs.existsSync(newPath) ? newPath : legacyPath;
+  };
+  const configPath = resolveConfig('config.json');
+  const operationsPath = resolveConfig('operations.json');
   const proofPath = path.join(serviceRoot, '.validation-proof.json');
 
   const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));

package/src/helpers/createServiceReadinessTests.js

@@ -64,9 +64,14 @@ function createServiceReadinessTests(testsDir, options = {}) {
     );
   }
 
-  // Load configuration files (validated above)
-  const configPath = path.join(serviceRoot, 'conn-config/config.json');
-  const operationsPath = path.join(serviceRoot, 'conn-config/operations.json');
+  // Load configuration files — prefer config/service/, fall back to conn-config/
+  const resolveConfig = (filename) => {
+    const newPath = path.join(serviceRoot, 'config', 'service', filename);
+    const legacyPath = path.join(serviceRoot, 'conn-config', filename);
+    return fs.existsSync(newPath) ? newPath : legacyPath;
+  };
+  const configPath = resolveConfig('config.json');
+  const operationsPath = resolveConfig('operations.json');
   const appPath = path.join(serviceRoot, 'src/app.js');
 
   const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));