Merge pull request finos#1752 from rocketstack-matt/calm-cleanup

CALM Schema Cleanup - shared project

Author: markscott-ms

shared/src/commands/generate/generate.spec.ts

@@ -15,10 +15,6 @@ vi.mock('../../logger', () => {
     };
 });
 
-vi.mock('../../consts', () => ({
-    get CALM_META_SCHEMA_DIRECTORY() { return '../calm/draft/2025-03/meta'; }
-}));
-
 vi.mock('./components/instantiate', () => ({
     instantiate: vi.fn(() => Promise.resolve({
         nodes: [{ 'unique-id': 'mock-node' }],

shared/src/commands/validate/validate.spec.ts

@@ -1,6 +1,4 @@
 import { validate, sortSpectralIssueBySeverity, convertSpectralDiagnosticToValidationOutputs, convertJsonSchemaIssuesToValidationOutputs, stripRefs, exitBasedOffOfValidationOutcome, extractChoicesFromArchitecture } from './validate';
-import { readFileSync } from 'fs';
-import path from 'path';
 import { ISpectralDiagnostic } from '@stoplight/spectral-core';
 import { ValidationOutcome, ValidationOutput } from './validation.output';
 import { ErrorObject } from 'ajv';
@@ -196,7 +194,7 @@ describe('validation support functions', () => {
             const given: ErrorObject[] = [
                 {
                     'instancePath': '/nodes/0/interfaces/0/port',
-                    'schemaPath': 'https://calm.finos.org/draft/2024-10/meta/interface.json#/defs/host-port-interface/properties/port/type',
+                    'schemaPath': 'https://calm.finos.org/release/1.0/meta/interface.json#/defs/host-port-interface/properties/port/type',
                     'keyword': 'type',
                     'params': {
                         'type': 'integer'
@@ -211,7 +209,7 @@ describe('validation support functions', () => {
                     'error',
                     'must be integer',
                     '/nodes/0/interfaces/0/port',
-                    'https://calm.finos.org/draft/2024-10/meta/interface.json#/defs/host-port-interface/properties/port/type'
+                    'https://calm.finos.org/release/1.0/meta/interface.json#/defs/host-port-interface/properties/port/type'
                 )
             ];
 
@@ -553,42 +551,6 @@ describe('validate - architecture only', () => {
         expect(response.allValidationOutputs()).not.toBeNull();
         expect(response.allValidationOutputs().length).toBe(0);
     });
-
-    it('validates architecture against schema specified in $schema property when no pattern provided', async () => {
-        const expectedSpectralOutput: ISpectralDiagnostic[] = [];
-        mocks.spectralRun.mockReturnValue(expectedSpectralOutput);
-
-        // Create a simple valid architecture with a CALM schema reference
-        const validArchitecture = {
-            '$schema': 'https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/calm.json',
-            'nodes': [
-                {
-                    'unique-id': 'test-node',
-                    'node-type': 'system',
-                    'name': 'Test Node',
-                    'description': 'A test node'
-                }
-            ],
-            'relationships': []
-        };
-
-        const calmSchema = readFileSync(path.resolve(__dirname, '../../../test_fixtures/calm/calm.json'), 'utf8');
-        const coreSchema = readFileSync(path.resolve(__dirname, '../../../test_fixtures/calm/core.json'), 'utf8');
-        schemaDirectory.getSchema = vi.fn((id: string) => {
-            if (id.includes('calm.json')) return JSON.parse(calmSchema);
-            if (id.includes('core.json')) return JSON.parse(coreSchema);
-            return undefined;
-        });
-
-        const response = await validate(validArchitecture, undefined, schemaDirectory, false);
-
-        expect(response).not.toBeNull();
-        expect(response).not.toBeUndefined();
-
-        // For a valid architecture, we should not have errors
-        expect(response.hasErrors).toBeFalsy();
-        expect(response.hasWarnings).toBeFalsy();
-    });
 });
 
 function buildISpectralDiagnostic(code: string, message: string, severity: number): ISpectralDiagnostic {

shared/src/schema-directory.spec.ts

@@ -1,6 +1,7 @@
 import { SchemaDirectory } from '.';
 import { DocumentLoader } from './document-loader/document-loader';
 import { readFileSync } from 'node:fs';
+import path from 'node:path';
 
 vi.mock('./logger', () => {
     return {
@@ -53,8 +54,8 @@ describe('SchemaDirectory', () => {
     it('resolves a reference from a stored schema', async () => {
         const schemaDir = new SchemaDirectory(mockDocLoader);
 
-        const nodeJson = loadSchema('test_fixtures/calm/core.json');
-        const nodeRef = 'https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json#/defs/node';
+        const nodeJson = loadSchema(path.join(__dirname, '../../calm/release/1.0/meta/core.json'));
+        const nodeRef = 'https://calm.finos.org/release/1.0/meta/core.json#/defs/node';
 
         mockDocLoader.loadMissingDocument.mockReturnValueOnce(new Promise(resolve => resolve(nodeJson)));
 

shared/test_fixtures/additional-props.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/calm.json",
-  "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/pattern/api-gateway",
+  "$schema": "https://calm.finos.org/release/1.0/meta/calm.json",
+  "$id": "https://calm.finos.org/pattern/api-gateway",
   "title": "API Gateway Pattern",
   "type": "object",
   "properties": {
@@ -9,7 +9,7 @@
       "minItems": 3,
       "prefixItems": [
         {
-          "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/release/1.0/meta/core.json#/defs/node",
           "properties": {
             "ingress-host": {
               "type": "string"
@@ -40,7 +40,7 @@
           ]
         },
         {
-          "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/release/1.0/meta/core.json#/defs/node",
           "properties": {
             "description": {
               "const": "The API Consumer making an authenticated and authorized request"
@@ -57,7 +57,7 @@
           }
         },
         {
-          "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/release/1.0/meta/core.json#/defs/node",
           "properties": {
             "host": {
               "type": "string"
@@ -84,7 +84,7 @@
           ]
         },
         {
-          "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/release/1.0/meta/core.json#/defs/node",
           "properties": {
             "description": {
               "const": "The Identity Provider used to verify the bearer token"