@onlineapps/conn-orch-validator 2.0.29 → 2.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-validator",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "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/ValidationOrchestrator.js

@@ -29,9 +29,14 @@ class ValidationOrchestrator {
       throw new Error('serviceUrl is required for ValidationOrchestrator');
     }
 
-    // Paths
-    this.configPath = path.join(this.serviceRoot, 'conn-config');
-    this.runtimePath = path.join(this.serviceRoot, 'conn-runtime');
+    // 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;
+
+    const newRuntimeDir = path.join(this.serviceRoot, 'config', 'runtime');
+    const legacyRuntimeDir = path.join(this.serviceRoot, 'conn-runtime');
+    this.runtimePath = fs.existsSync(newRuntimeDir) ? newRuntimeDir : legacyRuntimeDir;
     this.proofPath = path.join(this.runtimePath, 'validation-proof.json');
 
     // Validators
@@ -136,7 +141,7 @@ class ValidationOrchestrator {
       const packageFile = path.join(this.serviceRoot, 'package.json');
       const dockerFile = path.join(this.serviceRoot, 'Dockerfile');
       const dockerComposeFile = path.join(this.serviceRoot, 'docker-compose.yml');
-      const envExampleFile = path.join(this.serviceRoot, '.env.example');
+      const envTemplateFile = path.join(this.serviceRoot, '..', '..', 'config', 'env-templates', `${path.basename(this.serviceRoot)}.env`);
 
       if (!fs.existsSync(configFile)) {
         throw new Error('config.json not found');
@@ -154,8 +159,8 @@ class ValidationOrchestrator {
       if (fs.existsSync(dockerComposeFile)) {
         infra.dockerCompose = fs.readFileSync(dockerComposeFile, 'utf8');
       }
-      if (fs.existsSync(envExampleFile)) {
-        infra.envExample = fs.readFileSync(envExampleFile, 'utf8');
+      if (fs.existsSync(envTemplateFile)) {
+        infra.envTemplate = fs.readFileSync(envTemplateFile, 'utf8');
       }
 
       // Extract @onlineapps/* dependencies

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'));

package/src/validators/ServiceStructureValidator.js

@@ -15,6 +15,28 @@
 const fs = require('fs');
 const path = require('path');
 
+/**
+ * Try reading from new path first (config/service/), fall back to legacy (conn-config/).
+ * @param {string} root - Service root
+ * @param {string} filename - e.g. 'config.json'
+ * @returns {string|null} File contents or null
+ */
+function readConfigFile(root, filename) {
+  const candidates = [
+    path.join(root, 'config', 'service', filename),
+    path.join(root, 'conn-config', filename)
+  ];
+  for (const p of candidates) {
+    try { return fs.readFileSync(p, 'utf-8'); } catch { /* try next */ }
+  }
+  return null;
+}
+
+function hasConfigDir(root) {
+  return fs.existsSync(path.join(root, 'config', 'service')) ||
+         fs.existsSync(path.join(root, 'conn-config'));
+}
+
 const STANDARD_LEVELS = [
   {
     level: 'v1.0',
@@ -25,13 +47,13 @@ const STANDARD_LEVELS = [
       const has = (p) => fs.existsSync(path.join(root, p));
       const read = (p) => { try { return fs.readFileSync(path.join(root, p), 'utf-8'); } catch { return null; } };
 
-      results.push({ passed: has('conn-config'), id: 'dir_conn_config', message: 'conn-config/ directory' });
+      results.push({ passed: hasConfigDir(root), id: 'dir_conn_config', message: 'config/service/ or conn-config/ directory' });
       results.push({ passed: has('src'), id: 'dir_src', message: 'src/ directory' });
       results.push({ passed: has('tests'), id: 'dir_tests', message: 'tests/ directory' });
       results.push({ passed: has('src/app.js'), id: 'file_app', message: 'src/app.js' });
       results.push({ passed: has('index.js'), id: 'file_index', message: 'index.js entry point' });
 
-      const configRaw = read('conn-config/config.json');
+      const configRaw = readConfigFile(root, 'config.json');
       let configValid = false;
       if (configRaw) {
         try {
@@ -41,7 +63,7 @@ const STANDARD_LEVELS = [
       }
       results.push({ passed: configValid, id: 'config_valid', message: 'Valid config.json with service.name + service.port' });
 
-      const opsRaw = read('conn-config/operations.json');
+      const opsRaw = readConfigFile(root, 'operations.json');
       let opsValid = false;
       if (opsRaw) {
         try {
@@ -69,9 +91,7 @@ const STANDARD_LEVELS = [
     name: 'Multitenancy Standard',
     since: '2026-03-01',
     checks: (root) => {
-      const read = (p) => { try { return fs.readFileSync(path.join(root, p), 'utf-8'); } catch { return null; } };
-
-      const configRaw = read('conn-config/config.json');
+      const configRaw = readConfigFile(root, 'config.json');
       let hasTenantContext = false;
       if (configRaw) {
         try {
@@ -224,11 +244,22 @@ class ServiceStructureValidator {
    */
   validateDirectoryStructure() {
     const requiredDirs = [
-      { path: 'conn-config', description: 'Configuration directory' },
       { path: 'src', description: 'Source code directory' },
       { path: 'tests', description: 'Tests directory' }
     ];
 
+    if (!hasConfigDir(this.serviceRoot)) {
+      this.errors.push({
+        type: 'MISSING_DIRECTORY',
+        path: 'config/service/ (or conn-config/)',
+        message: 'Required directory missing: config/service/ (or legacy conn-config/)',
+        description: 'Configuration directory',
+        fix: 'Create directory: mkdir -p config/service'
+      });
+    } else {
+      this.info.push('✓ Found Configuration directory');
+    }
+
     const recommendedDirs = [
       { path: 'tests/unit', description: 'Unit tests' },
       { path: 'tests/integration', description: 'Integration tests' },
@@ -268,48 +299,46 @@ class ServiceStructureValidator {
    * Validate configuration files
    */
   validateConfigurationFiles() {
-    // 1. Validate conn-config/config.json
-    const configPath = path.join(this.serviceRoot, 'conn-config/config.json');
-    if (!fs.existsSync(configPath)) {
+    const configRaw = readConfigFile(this.serviceRoot, 'config.json');
+    if (!configRaw) {
       this.errors.push({
         type: 'MISSING_CONFIG',
-        path: 'conn-config/config.json',
-        message: 'Service configuration missing: conn-config/config.json',
+        path: 'config/service/config.json (or conn-config/config.json)',
+        message: 'Service configuration missing: config/service/config.json (or conn-config/config.json)',
         fix: 'Create config.json with service metadata. See: /docs/standards/SERVICE_TEMPLATE.md'
       });
     } else {
       try {
-        const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        const config = JSON.parse(configRaw);
         this.validateConfigStructure(config);
         this.info.push('✓ Found valid config.json');
       } catch (error) {
         this.errors.push({
           type: 'INVALID_CONFIG',
-          path: 'conn-config/config.json',
+          path: 'config.json',
           message: `Invalid JSON in config.json: ${error.message}`,
           fix: 'Fix JSON syntax errors in config.json'
         });
       }
     }
 
-    // 2. Validate conn-config/operations.json
-    const operationsPath = path.join(this.serviceRoot, 'conn-config/operations.json');
-    if (!fs.existsSync(operationsPath)) {
+    const opsRaw = readConfigFile(this.serviceRoot, 'operations.json');
+    if (!opsRaw) {
       this.errors.push({
         type: 'MISSING_OPERATIONS',
-        path: 'conn-config/operations.json',
-        message: 'Operations specification missing: conn-config/operations.json',
+        path: 'config/service/operations.json (or conn-config/operations.json)',
+        message: 'Operations specification missing: config/service/operations.json (or conn-config/operations.json)',
         fix: 'Create operations.json. See: /docs/standards/OPERATIONS.md'
       });
     } else {
       try {
-        const operations = JSON.parse(fs.readFileSync(operationsPath, 'utf-8'));
+        const operations = JSON.parse(opsRaw);
         this.validateOperationsStructure(operations);
         this.info.push('✓ Found valid operations.json');
       } catch (error) {
         this.errors.push({
           type: 'INVALID_OPERATIONS',
-          path: 'conn-config/operations.json',
+          path: 'operations.json',
           message: `Invalid JSON in operations.json: ${error.message}`,
           fix: 'Fix JSON syntax errors in operations.json'
         });
@@ -338,7 +367,7 @@ class ServiceStructureValidator {
       if (!value) {
         this.errors.push({
           type: 'MISSING_CONFIG_FIELD',
-          path: 'conn-config/config.json',
+          path: 'config/service/config.json',
           field: field,
           message: `Required field missing in config.json: ${field}`,
           fix: `Add "${field}" to config.json`
@@ -351,7 +380,7 @@ class ServiceStructureValidator {
       if (!/^[a-z][a-z0-9-]*$/.test(config.service.name)) {
         this.warnings.push({
           type: 'INVALID_SERVICE_NAME',
-          path: 'conn-config/config.json',
+          path: 'config/service/config.json',
           field: 'service.name',
           value: config.service.name,
           message: `Service name should be lowercase kebab-case: ${config.service.name}`,
@@ -387,7 +416,7 @@ class ServiceStructureValidator {
     if (!operations.operations) {
       this.errors.push({
         type: 'INVALID_OPERATIONS_STRUCTURE',
-        path: 'conn-config/operations.json',
+        path: 'config/service/operations.json',
         message: 'operations.json must have "operations" key',
         fix: 'Wrap operations in {"operations": {...}}. See: /docs/standards/OPERATIONS.md'
       });
@@ -398,7 +427,7 @@ class ServiceStructureValidator {
     if (typeof ops !== 'object' || Array.isArray(ops)) {
       this.errors.push({
         type: 'INVALID_OPERATIONS_TYPE',
-        path: 'conn-config/operations.json',
+        path: 'config/service/operations.json',
         message: 'operations must be an object',
         fix: 'operations should be key-value pairs: {"operation-name": {...}}'
       });
@@ -408,7 +437,7 @@ class ServiceStructureValidator {
     if (Object.keys(ops).length === 0) {
       this.warnings.push({
         type: 'NO_OPERATIONS',
-        path: 'conn-config/operations.json',
+        path: 'config/service/operations.json',
         message: 'No operations defined',
         fix: 'Add at least one operation to operations.json'
       });
@@ -431,7 +460,7 @@ class ServiceStructureValidator {
       if (!spec[field]) {
         this.errors.push({
           type: 'MISSING_OPERATION_FIELD',
-          path: 'conn-config/operations.json',
+          path: 'config/service/operations.json',
           operation: name,
           field: field,
           message: `Operation "${name}" missing required field: ${field}`,
@@ -444,7 +473,7 @@ class ServiceStructureValidator {
     if (spec.endpoint && !spec.endpoint.startsWith('/')) {
       this.errors.push({
         type: 'INVALID_ENDPOINT',
-        path: 'conn-config/operations.json',
+        path: 'config/service/operations.json',
         operation: name,
         field: 'endpoint',
         value: spec.endpoint,
@@ -458,7 +487,7 @@ class ServiceStructureValidator {
     if (spec.method && !validMethods.includes(spec.method)) {
       this.errors.push({
         type: 'INVALID_HTTP_METHOD',
-        path: 'conn-config/operations.json',
+        path: 'config/service/operations.json',
         operation: name,
         field: 'method',
         value: spec.method,