Merge branch 'main' into logo

Author: oliviajanejohns

calm/pattern/api-gateway.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://calm.finos.org/draft/2024-10/meta/calm.json",
+  "$schema": "https://calm.finos.org/draft/2025-03/meta/calm.json",
   "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/pattern/api-gateway",
   "title": "API Gateway Pattern",
   "type": "object",
@@ -9,7 +9,7 @@
       "minItems": 4,
       "prefixItems": [
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/node",
           "properties": {
             "well-known-endpoint": {
               "type": "string"
@@ -31,7 +31,7 @@
               "minItems": 1,
               "prefixItems": [
                 {
-                  "$ref": "https://calm.finos.org/draft/2024-10/meta/interface.json#/defs/host-port-interface",
+                  "$ref": "https://calm.finos.org/draft/2025-03/meta/interface.json#/defs/host-port-interface",
                   "properties": {
                     "unique-id": {
                       "const": "api-gateway-ingress"
@@ -47,7 +47,7 @@
           ]
         },
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/node",
           "properties": {
             "description": {
               "const": "The API Consumer making an authenticated and authorized request"
@@ -64,7 +64,7 @@
           }
         },
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/node",
           "properties": {
             "description": {
               "const": "The API Producer serving content"
@@ -83,7 +83,7 @@
               "minItems": 1,
               "prefixItems": [
                 {
-                  "$ref": "https://calm.finos.org/draft/2024-10/meta/interface.json#/defs/host-port-interface",
+                  "$ref": "https://calm.finos.org/draft/2025-03/meta/interface.json#/defs/host-port-interface",
                   "properties": {
                     "unique-id": {
                       "const": "producer-ingress"
@@ -98,7 +98,7 @@
           ]
         },
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/node",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/node",
           "properties": {
             "description": {
               "const": "The Identity Provider used to verify the bearer token"
@@ -121,7 +121,7 @@
       "minItems": 4,
       "prefixItems": [
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/relationship",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/relationship",
           "properties": {
             "unique-id": {
               "const": "api-consumer-api-gateway"
@@ -154,7 +154,7 @@
           }
         },
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/relationship",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/relationship",
           "properties": {
             "unique-id": {
               "const": "api-gateway-idp"
@@ -180,7 +180,7 @@
           }
         },
         {
-          "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/relationship",
+          "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/relationship",
           "properties": {
             "unique-id": {
               "const": "api-gateway-api-producer"
@@ -209,7 +209,7 @@
           }
         },
         {
-            "$ref": "https://calm.finos.org/draft/2024-10/meta/core.json#/defs/relationship",
+            "$ref": "https://calm.finos.org/draft/2025-03/meta/core.json#/defs/relationship",
             "properties": {
               "unique-id": {
                 "const": "api-consumer-idp"

cli/jest.config.js

@@ -1,6 +1,6 @@
 {
   "name": "@finos/calm-cli",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "A set of tools for interacting with the Common Architecture Language Model (CALM)",
   "main": "dist/index.js",
   "files": [
@@ -12,9 +12,9 @@
   "scripts": {
     "build": "tsup && npm run copy-calm-schema && npm run copy-docify-templates",
     "watch": "node watch.mjs",
-    "copy-calm-schema": "copyfiles \"../calm/draft/2024-10/meta/*\" dist/calm/",
-    "copy-docify-templates": "copyfiles \"../shared/src/docify/template-bundles/**/*\" dist --up 4",
-    "test": "jest",
+    "copy-calm-schema": "copyfiles \"../calm/draft/2025-03/meta/*\" dist/calm/",
+    "copy-docify-templates": "copyfiles \"../shared/dist/template-bundles/**/*\" dist --up 3",
+    "test": "vitest run",
     "lint": "eslint src",
     "lint-fix": "eslint src --fix",
     "dependency-check": "dependency-check --project 'calm-cli' --scan . --out ./dependency-check-report --format ALL --suppression ../.github/node-cve-ignore-list.xml"
@@ -32,7 +32,9 @@
     "commander": "^13.0.0",
     "copyfiles": "^2.4.1",
     "mkdirp": "^3.0.1",
-    "express-rate-limit": "^7.5.0"
+    "express-rate-limit": "^7.5.0",
+    "@apidevtools/json-schema-ref-parser": "^11.9.3",
+    "ts-node": "10.9.2"
   },
   "devDependencies": {
     "@types/supertest": "^6.0.2",
@@ -54,10 +56,10 @@
     "supertest": "^7.0.0",
     "link": "^2.1.1",
     "ts-jest": "^29.2.5",
-    "ts-node": "10.9.2",
     "tsup": "^8.0.0",
     "typescript": "^5.4.3",
     "xml2js": "^0.6.2"
+
   },
   "overrides": {
     "esbuild": "^0.25.0"