@onlineapps/conn-orch-validator 2.0.6 → 2.0.9

package/README.md

@@ -66,6 +66,35 @@ services/my-service/
 
 ---
 
+## Validation Proof Structure
+
+**Location:** `conn-runtime/validation-proof.json`
+
+```json
+{
+  "validationProof": "sha256-hash-of-validationData",
+  "validationData": {
+    "serviceName": "hello-service",
+    "version": "1.0.0",
+    "validator": "@onlineapps/conn-orch-validator",
+    "validatorVersion": "2.0.6",
+    "validatedAt": "2025-10-22T10:30:45.123Z",
+    "testsRun": 15,
+    "testsPassed": 15,
+    "testsFailed": 0,
+    "durationMs": 234
+  }
+}
+```
+
+**Proof Lifecycle:**
+- **Valid for:** 30 days OR until service fingerprint changes
+- **Fingerprint:** SHA256 hash of (version + operations + dependencies + config)
+- **Revalidation:** Automatic if proof missing/invalid/expired
+- **Registry:** Accepts service with valid proof (skips Tier 2 validation)
+
+---
+
 ## Related Documentation
 
 - [SERVICE_REGISTRATION_FLOW.md](/services/hello-service/docs/SERVICE_REGISTRATION_FLOW.md)
@@ -75,4 +104,4 @@ services/my-service/
 
 ---
 
-*Last updated: 2025-10-21*
+*Last updated: 2025-10-22*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-validator",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "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

@@ -76,14 +76,14 @@ class CookbookTestRunner {
 
     // Calculate results
     const duration = Date.now() - startTime;
-    const passed = stepResults.every(r => r.passed);
+    const passedCount = stepResults.filter(r => r.passed).length;
     const failed = stepResults.filter(r => !r.passed).length;
 
     const results = {
       cookbook: cookbookData.description || 'Unnamed',
-      passed,
+      passed: passedCount === stepResults.length, // Boolean: all steps passed
       total: stepResults.length,
-      passed: stepResults.filter(r => r.passed).length,
+      passedCount, // Number: count of passed steps
       failed,
       duration,
       steps: stepResults
@@ -91,7 +91,7 @@ class CookbookTestRunner {
 
     // Update aggregate results
     this.results.total += results.total;
-    this.results.passed += results.passed;
+    this.results.passed += results.passedCount;
     this.results.failed += results.failed;
     this.results.duration += results.duration;
     this.results.steps.push(...results.steps);

package/src/ValidationOrchestrator.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { ValidationProofCodec, FingerprintUtils } = require('@onlineapps/service-validator-core');
+const { ValidationProofCodec } = require('@onlineapps/service-validator-core');
 const { ServiceStructureValidator } = require('./validators/ServiceStructureValidator');
 const ServiceReadinessValidator = require('./ServiceReadinessValidator');
 const CookbookTestRunner = require('./CookbookTestRunner');
@@ -88,33 +88,30 @@ class ValidationOrchestrator {
 
   /**
    * Check if proof is still valid
-   * Valid = correct fingerprint + not expired
+   * Valid = correct signature + fingerprint + not expired
    */
   async isProofValid(proof) {
     try {
-      // Calculate current fingerprint
-      const currentFingerprint = await this.calculateFingerprint();
-
-      // Check if fingerprint matches
-      if (proof.fingerprint !== currentFingerprint) {
-        console.log('[ValidationOrchestrator] Fingerprint mismatch (service changed)');
+      if (!proof) {
         return false;
       }
 
-      // Check expiration (proof valid for 30 days)
-      const proofDate = new Date(proof.validatedAt);
-      const now = new Date();
-      const daysSinceValidation = (now - proofDate) / (1000 * 60 * 60 * 24);
+      // Decode and verify proof using ValidationProofCodec
+      const verificationResult = ValidationProofCodec.decode(proof, {
+        maxProofAge: 30 * 24 * 60 * 60 * 1000 // 30 days
+      });
 
-      if (daysSinceValidation > 30) {
-        console.log('[ValidationOrchestrator] Proof expired (>30 days old)');
+      if (!verificationResult.valid) {
+        console.log(`[ValidationOrchestrator] Proof validation failed: ${verificationResult.reason}`);
         return false;
       }
 
-      // Verify proof signature
-      const isValid = ValidationProofCodec.verify(proof);
-      if (!isValid) {
-        console.warn('[ValidationOrchestrator] Proof signature invalid');
+      // Calculate current fingerprint
+      const currentFingerprint = await this.calculateFingerprint();
+
+      // Check if fingerprint matches
+      if (proof.validationProof !== currentFingerprint) {
+        console.log('[ValidationOrchestrator] Fingerprint mismatch (service changed)');
         return false;
       }
 
@@ -135,6 +132,10 @@ class ValidationOrchestrator {
       const operationsFile = path.join(this.configPath, 'operations.json');
       const packageFile = path.join(this.serviceRoot, 'package.json');
 
+      if (!fs.existsSync(configFile)) {
+        throw new Error('config.json not found');
+      }
+
       const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
       const operations = JSON.parse(fs.readFileSync(operationsFile, 'utf8'));
       const pkg = JSON.parse(fs.readFileSync(packageFile, 'utf8'));
@@ -149,12 +150,18 @@ class ValidationOrchestrator {
         });
       }
 
-      return FingerprintUtils.generate({
+      // Generate fingerprint using crypto SHA256
+      const fingerprintData = {
         serviceVersion: config.service?.version || pkg.version,
         operations: operations,
         dependencies: deps,
-        configHash: FingerprintUtils.generate(config)
-      });
+        config: config
+      };
+
+      // Stringify with sorted keys for deterministic output
+      const hashInput = JSON.stringify(fingerprintData, Object.keys(fingerprintData).sort());
+      const crypto = require('crypto');
+      return crypto.createHash('sha256').update(hashInput).digest('hex');
     } catch (error) {
       throw new Error(`Failed to calculate fingerprint: ${error.message}`);
     }
@@ -471,7 +478,7 @@ class ValidationOrchestrator {
       }
     } else {
       console.error(`[ValidationOrchestrator] ❌ Validation FAILED (${duration}ms)`);
-      console.error(`[ValidationOrchestrator] Errors: ${results.errors.join(', ')}`);
+      console.error(`[ValidationOrchestrator] Errors: ${JSON.stringify(results.errors, null, 2)}`);
     }
 
     return results;

package/tests/component/testing-framework-integration.test.js

@@ -1,313 +0,0 @@
-'use strict';
-
-/**
- * Component tests for E2E Testing Framework
- * Tests the integration between different testing utilities
- */
-
-describe('E2E Testing Framework Integration @component', () => {
-  let framework;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    delete require.cache[require.resolve('../../src/index.js')];
-    framework = require('../../src/index.js');
-  });
-
-  describe('Framework Exports', () => {
-    it('should export all mock components', () => {
-      expect(framework.MockMQClient).toBeDefined();
-      expect(framework.MockRegistry).toBeDefined();
-      expect(framework.MockStorage).toBeDefined();
-    });
-
-    it('should export all test utilities', () => {
-      expect(framework.ServiceTestHarness).toBeDefined();
-      expect(framework.ServiceValidator).toBeDefined();
-      expect(framework.WorkflowTestRunner).toBeDefined();
-      expect(framework.CookbookTestUtils).toBeDefined();
-      expect(framework.ServiceReadinessValidator).toBeDefined();
-      expect(framework.TestOrchestrator).toBeDefined();
-    });
-
-    it('should export factory functions', () => {
-      expect(typeof framework.createTestHarness).toBe('function');
-      expect(typeof framework.createValidator).toBe('function');
-      expect(typeof framework.createMockMQ).toBe('function');
-      expect(typeof framework.createMockRegistry).toBe('function');
-      expect(typeof framework.createMockStorage).toBe('function');
-    });
-  });
-
-  describe('Factory Functions', () => {
-    it('should create MockMQClient instance', () => {
-      const mq = framework.createMockMQ();
-      expect(mq.constructor.name).toBe('MockMQClient');
-      expect(typeof mq.connect).toBe('function');
-      expect(typeof mq.publish).toBe('function');
-    });
-
-    it('should create MockRegistry instance', () => {
-      const registry = framework.createMockRegistry();
-      expect(registry.constructor.name).toBe('MockRegistry');
-      expect(typeof registry.register).toBe('function');
-      expect(typeof registry.discover).toBe('function');
-    });
-
-    it('should create MockStorage instance', () => {
-      const storage = framework.createMockStorage();
-      expect(storage.constructor.name).toBe('MockStorage');
-      expect(typeof storage.upload).toBe('function');
-      expect(typeof storage.download).toBe('function');
-    });
-
-    it('should create ServiceTestHarness with options', () => {
-      const harness = framework.createTestHarness({
-        serviceName: 'test-service'
-      });
-      expect(harness.constructor.name).toBe('ServiceTestHarness');
-      expect(harness.serviceName).toBe('test-service');
-    });
-
-    it('should create ServiceValidator with options', () => {
-      const validator = framework.createValidator({
-        services: ['service1', 'service2']
-      });
-      expect(validator.constructor.name).toBe('ServiceValidator');
-      expect(validator.services).toEqual(['service1', 'service2']);
-    });
-  });
-
-  describe('Component Integration', () => {
-    it('should allow ServiceTestHarness to use mocks', async () => {
-      const harness = new framework.ServiceTestHarness({
-        serviceName: 'integration-test'
-      });
-
-      await harness.setup();
-
-      // Harness should have created mock instances
-      expect(harness.mq).toBeDefined();
-      expect(harness.registry).toBeDefined();
-      expect(harness.storage).toBeDefined();
-
-      await harness.cleanup();
-    });
-
-    it('should allow WorkflowTestRunner to use MockMQClient', async () => {
-      const mq = new framework.MockMQClient();
-      const runner = new framework.WorkflowTestRunner({
-        mq: mq
-      });
-
-      expect(runner.mq).toBe(mq);
-      expect(runner.state).toBeDefined();
-    });
-
-    it('should allow ServiceValidator to work with OpenAPI specs', () => {
-      const validator = new framework.ServiceValidator();
-
-      const spec = {
-        openapi: '3.0.0',
-        paths: {
-          '/test': {
-            get: {
-              responses: {
-                '200': { description: 'Success' }
-              }
-            }
-          }
-        }
-      };
-
-      const paths = validator.countEndpoints(spec.paths);
-      expect(paths).toBeGreaterThan(0);
-    });
-
-    it('should allow CookbookTestUtils to generate valid cookbooks', () => {
-      const utils = new framework.CookbookTestUtils();
-
-      const cookbook = utils.generateCookbook({
-        name: 'test-cookbook',
-        steps: 3
-      });
-
-      expect(cookbook.name).toBe('test-cookbook');
-      expect(cookbook.version).toBeDefined();
-      expect(cookbook.steps).toHaveLength(3);
-      expect(cookbook.steps[0]).toHaveProperty('service');
-      expect(cookbook.steps[0]).toHaveProperty('operation');
-    });
-
-    it('should allow TestOrchestrator to coordinate components', () => {
-      const harness = new framework.ServiceTestHarness({
-        serviceName: 'orchestrated-test'
-      });
-      const validator = new framework.ServiceValidator();
-      const runner = new framework.WorkflowTestRunner({
-        mq: new framework.MockMQClient()
-      });
-
-      const orchestrator = new framework.TestOrchestrator({
-        harness,
-        validator,
-        runner
-      });
-
-      expect(orchestrator.harness).toBe(harness);
-      expect(orchestrator.validator).toBe(validator);
-      expect(orchestrator.runner).toBe(runner);
-    });
-  });
-
-  describe('Mock Components Behavior', () => {
-    it('MockMQClient should handle basic operations', async () => {
-      const mq = new framework.MockMQClient();
-
-      // Should connect
-      await mq.connect();
-      expect(mq.isConnected).toBe(true);
-
-      // Should publish messages
-      await mq.publish('test-queue', { test: true });
-      const messages = mq.getMessages('test-queue');
-      expect(messages).toHaveLength(1);
-      expect(messages[0]).toEqual({ test: true });
-
-      // Should disconnect
-      await mq.disconnect();
-      expect(mq.isConnected).toBe(false);
-    });
-
-    it('MockRegistry should handle service registration', async () => {
-      const registry = new framework.MockRegistry();
-
-      // Should register service
-      await registry.register({
-        name: 'test-service',
-        version: '1.0.0'
-      });
-
-      // Should discover service
-      const services = await registry.discover('test-service');
-      expect(services).toHaveLength(1);
-      expect(services[0].name).toBe('test-service');
-    });
-
-    it('MockStorage should handle file operations', async () => {
-      const storage = new framework.MockStorage();
-
-      // Should upload file
-      const data = Buffer.from('test data');
-      await storage.upload('bucket', 'key', data);
-
-      // Should download file
-      const retrieved = await storage.download('bucket', 'key');
-      expect(retrieved.toString()).toBe('test data');
-
-      // Should list files
-      const files = await storage.list('bucket');
-      expect(files).toContain('key');
-    });
-  });
-
-  describe('Testing Utilities Behavior', () => {
-    it('ServiceReadinessValidator should check readiness', async () => {
-      const validator = new framework.ServiceReadinessValidator({
-        services: ['api', 'worker']
-      });
-
-      // Mock service readiness
-      validator.mockServiceReady('api');
-      validator.mockServiceReady('worker');
-
-      const allReady = await validator.checkAll();
-      expect(allReady).toBe(true);
-    });
-
-    it('CookbookTestUtils should validate cookbook structure', () => {
-      const utils = new framework.CookbookTestUtils();
-
-      const validCookbook = {
-        name: 'valid-cookbook',
-        version: '1.0.0',
-        steps: [
-          {
-            service: 'service1',
-            operation: 'process'
-          }
-        ]
-      };
-
-      const validation = utils.validate(validCookbook);
-      expect(validation.valid).toBe(true);
-
-      const invalidCookbook = { steps: [] };
-      const invalidValidation = utils.validate(invalidCookbook);
-      expect(invalidValidation.valid).toBe(false);
-    });
-  });
-
-  describe('Error Handling', () => {
-    it('should handle missing configuration gracefully', () => {
-      expect(() => new framework.ServiceTestHarness()).not.toThrow();
-      expect(() => new framework.ServiceValidator()).not.toThrow();
-      expect(() => new framework.WorkflowTestRunner()).not.toThrow();
-    });
-
-    it('should handle invalid operations gracefully', async () => {
-      const mq = new framework.MockMQClient();
-
-      // Should fail when not connected
-      await expect(mq.publish('queue', {}))
-        .rejects.toThrow('Not connected');
-
-      // Storage should fail on non-existent files
-      const storage = new framework.MockStorage();
-      await expect(storage.download('bucket', 'nonexistent'))
-        .rejects.toThrow();
-    });
-  });
-
-  describe('Complete Testing Workflow', () => {
-    it('should support complete test workflow', async () => {
-      // 1. Setup test environment
-      const harness = new framework.ServiceTestHarness({
-        serviceName: 'complete-test'
-      });
-      await harness.setup();
-
-      // 2. Register mock services
-      await harness.registry.register({
-        name: 'service1',
-        version: '1.0.0'
-      });
-
-      // 3. Create test cookbook
-      const utils = new framework.CookbookTestUtils();
-      const cookbook = utils.generateCookbook({
-        name: 'test-workflow',
-        steps: 2
-      });
-
-      // 4. Run workflow
-      const runner = new framework.WorkflowTestRunner({
-        mq: harness.mq
-      });
-
-      // Mock step execution
-      runner.mockStepResponse('test-service-0', { success: true });
-      runner.mockStepResponse('test-service-1', { complete: true });
-
-      const result = await runner.runWorkflow(cookbook, { input: 'data' });
-      expect(result.status).toBe('completed');
-
-      // 5. Validate results
-      const validator = new framework.ServiceValidator();
-      expect(validator).toBeDefined();
-
-      // 6. Cleanup
-      await harness.cleanup();
-    });
-  });
-});