Merge branch 'main' into arhy/issue450

finos · Oct 14, 2024 · e533d84 · e533d84
2 parents 22acd52 + 8dc4300
commit e533d84
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 56 deletions.
diff --git a/.github/workflows/s3-sync.yml b/.github/workflows/s3-sync.yml
@@ -1,4 +1,4 @@
-name: Sync Drafts to S3
+name: Sync CALM to S3
 
 on:
   workflow_dispatch: {}
@@ -7,6 +7,7 @@ on:
       - main   
     paths:
       - 'calm/draft/**'
+      - 'calm/samples/**'
 
 jobs:
   sync-to-s3:
@@ -15,7 +16,6 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -25,3 +25,6 @@ jobs:
     - name: Sync calm/draft folder to S3
       run: |
         aws s3 sync calm/draft s3://${{ vars.AWS_S3_BUCKET }}/draft --delete
+    - name: Sync calm/samples folder to S3
+      run: |
+        aws s3 sync calm/samples s3://${{ vars.AWS_S3_BUCKET }}/samples --delete
diff --git a/calm/samples/traderx/controls/flow-sla-control-requirement.json b/calm/samples/traderx/controls/flow-sla-control-requirement.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
+  "$id": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
   "title": "Flow SLA Control",
   "type": "object",
   "allOf": [

diff --git a/calm/samples/traderx/flows/add-update-account/add-update-account-control-configuration.json b/calm/samples/traderx/flows/add-update-account/add-update-account-control-configuration.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-  "$id": "https://calm.finos.org/traderx/flows/add-update-account/add-update-account-control-configuration.json",
+  "$schema": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/add-update-account/add-update-account-control-configuration.json",
   "control-id": "flow-sla-001",
   "name": "Flow SLA Control for Add or Update Account",
   "description": "Ensure that the Add or Update Account flow meets the defined Service Level Agreement (SLA).",

diff --git a/calm/samples/traderx/flows/add-update-account/add-update-account.json b/calm/samples/traderx/flows/add-update-account/add-update-account.json
@@ -27,8 +27,8 @@
       "description": "Control requirement for flow SLA",
       "requirements": [
         {
-          "control-requirement": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-          "control-config": "https://calm.finos.org/traderx/flows/add-update-account/add-update-account-control-configuration.json"
+          "control-requirement-url": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+          "control-config": "https://calm.finos.org/samples/traderx/flows/add-update-account/add-update-account-control-configuration.json"
         }
       ]
     }

diff --git a/.../samples/traderx/flows/bootstrapping-position-blotter/bootstrapping-position-blotter.json b/.../samples/traderx/flows/bootstrapping-position-blotter/bootstrapping-position-blotter.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://calm.finos.org/draft/2024-10/meta/flow.json",
-  "$id": "https://calm.finos.org/traderx/flows/load-positions.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/load-positions.json",
   "unique-id": "flow-load-positions",
   "name": "Load Positions",
   "description": "Flow for loading positions for a specific account and subscribing to updates.",

diff --git a/calm/samples/traderx/flows/load-list-of-accounts/load-list-of-accounts.json b/calm/samples/traderx/flows/load-list-of-accounts/load-list-of-accounts.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://calm.finos.org/draft/2024-10/meta/flow.json",
-  "$id": "https://calm.finos.org/traderx/flows/load-list-of-accounts.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/load-list-of-accounts.json",
   "unique-id": "flow-load-list-of-accounts",
   "name": "Load List of Accounts",
   "description": "Flow for loading a list of accounts from the database to populate the GUI drop-down for user account selection.",

diff --git a/.../samples/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json b/.../samples/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-  "$id": "https://calm.finos.org/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json",
+  "$schema": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json",
   "control-id": "flow-sla-001",
   "name": "Flow SLA Control for Trade Ticket Submission",
   "description": "Ensure that Trade Ticket Submission flow meets the defined Service Level Agreement (SLA).",

diff --git a/calm/samples/traderx/flows/submit-trade-ticket/submit-trade-ticket.json b/calm/samples/traderx/flows/submit-trade-ticket/submit-trade-ticket.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://calm.finos.org/draft/2024-10/meta/flow.json",
-  "$id": "https://calm.finos.org/traderx/flows/submit-trade-ticket/submit-trade-ticket.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/submit-trade-ticket/submit-trade-ticket.json",
   "unique-id": "flow-submit-trade-ticket",
   "name": "Submitting a Trade Ticket",
   "description": "Flow for submitting a trade ticket and validating the trade, account, and publishing a new trade event.",
@@ -43,13 +43,15 @@
       "direction": "destination-to-source"
     }
   ],
-  "submit-trade-ticket-sla": {
-    "description": "Control requirement for flow SLA",
-    "requirements": [
-      {
-        "control-requirement": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-        "control-config": "https://calm.finos.org/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json"
-      }
-    ]
+  "controls": {
+    "submit-trade-ticket-sla": {
+      "description": "Control requirement for flow SLA",
+      "requirements": [
+        {
+          "control-requirement-url": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+          "control-config": "https://calm.finos.org/samples/traderx/flows/submit-trade-ticket/submit-trade-ticket-control-configuration.json"
+        }
+      ]
+    }
   }
 }
diff --git a/calm/samples/traderx/flows/trade-processing/trade-processing-control-configuration.json b/calm/samples/traderx/flows/trade-processing/trade-processing-control-configuration.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-  "$id": "https://calm.finos.org/traderx/flows/trade-processing/trade-processing-control-configuration.json",
+  "$schema": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/trade-processing/trade-processing-control-configuration.json",
   "control-id": "flow-sla-001",
   "name": "Flow SLA Control for Trade Processing",
   "description": "Ensure that Trade Processing flows meet the defined Service Level Agreement (SLA).",

diff --git a/calm/samples/traderx/flows/trade-processing/trade-processing-new-trade.json b/calm/samples/traderx/flows/trade-processing/trade-processing-new-trade.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://calm.finos.org/draft/2024-10/meta/flow.json",
-  "$id": "https://calm.finos.org/traderx/flows/trade-processing.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/trade-processing.json",
   "unique-id": "flow-trade-processing",
   "name": "Trade Processing - New Trade",
   "description": "The process flow for handling new trade events",
@@ -39,14 +39,16 @@
       "direction": "destination-to-source"
     }
   ],
-  "trade-processing-sla": {
-    "description": "Control requirement for flow SLA",
-    "requirements": [
-      {
-        "control-requirement": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-        "control-config": "https://calm.finos.org/traderx/flows/trade-processing/trade-processing-control-configuration.json"
-      }
-    ]
+  "controls": {
+    "trade-processing-sla": {
+      "description": "Control requirement for flow SLA",
+      "requirements": [
+        {
+          "control-requirement-url": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+          "control-config": "https://calm.finos.org/samples/traderx/flows/trade-processing/trade-processing-control-configuration.json"
+        }
+      ]
+    }
   }
 }
 
diff --git a/calm/samples/traderx/flows/trade-processing/trade-processing-update-trade.json b/calm/samples/traderx/flows/trade-processing/trade-processing-update-trade.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://calm.finos.org/draft/2024-10/meta/flow.json",
-  "$id": "https://calm.finos.org/traderx/flows/trade-processing.json",
+  "$id": "https://calm.finos.org/samples/traderx/flows/trade-processing.json",
   "unique-id": "flow-trade-processing",
   "name": "Trade Processing - New Trade",
   "description": "The process flow for handling update trade events",
@@ -39,13 +39,15 @@
       "direction": "destination-to-source"
     }
   ],
-  "trade-processing-sla": {
-    "description": "Control requirement for flow SLA",
-    "requirements": [
-      {
-        "control-requirement": "https://calm.finos.org/traderx/controls/flow-sla-control-requirement.json",
-        "control-config": "https://calm.finos.org/traderx/flows/trade-processing/trade-processing-control-configuration.json"
-      }
-    ]
+  "controls": {
+    "trade-processing-sla": {
+      "description": "Control requirement for flow SLA",
+      "requirements": [
+        {
+          "control-requirement-url": "https://calm.finos.org/samples/traderx/controls/flow-sla-control-requirement.json",
+          "control-config": "https://calm.finos.org/samples/traderx/flows/trade-processing/trade-processing-control-configuration.json"
+        }
+      ]
+    }
   }
 }
diff --git a/calm/samples/traderx/traderx.json b/calm/samples/traderx/traderx.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-04/meta/calm.json",
+  "$schema": "https://calm.finos.org/draft/2024-10/meta/calm.json",
   "nodes": [
     {
       "unique-id": "traderx-system",

diff --git a/calm/samples/traderx/traderx.yaml b/calm/samples/traderx/traderx.yaml
@@ -1,4 +1,4 @@
-$schema: https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-03/meta/calm.json
+$schema: https://calm.finos.org/draft/2024-10/meta/calm.json
 nodes:
   - unique-id: traderx-system
     node-type: system

diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -30,6 +30,7 @@
     "commander": "^12.0.0",
     "graphviz-cli": "^2.0.0",
     "js-yaml": "^4.1.0",
+    "jsonpath-plus": "^10.0.0",
     "json-pointer": "^0.6.2",
     "junit-report-builder": "^5.0.0",
     "lodash": "^4.17.21",
@@ -59,6 +60,7 @@
     "typescript": "^5.4.3"
   },
   "overrides": {
+    "jsonpath-plus": "^10.0.0",
     "path-to-regexp": "3.3.0",
     "rollup": "4.24.0"
   }