From 3dfa308e38cf57bec4e71cf9c3ce625f3236fe6e Mon Sep 17 00:00:00 2001
From: Matthew Bain <matt@rocketstack.co>
Date: Fri, 6 Sep 2024 08:16:10 +0100
Subject: [PATCH] Fix validation issues in schema defs

---
 .../2024-08/meta/control-requirement.json     | 21 ++++-------
 calm/draft/2024-08/meta/core.json             | 34 ++++++++---------
 calm/draft/2024-08/meta/evidence.json         | 37 +++++++++----------
 3 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/calm/draft/2024-08/meta/control-requirement.json b/calm/draft/2024-08/meta/control-requirement.json
index 9cb0b694..f27e4fcc 100644
--- a/calm/draft/2024-08/meta/control-requirement.json
+++ b/calm/draft/2024-08/meta/control-requirement.json
@@ -3,20 +3,13 @@
   "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/control-requirement.json",
   "title": "Common Architecture Language Model Control Requirement",
   "description": "Schema for defining control requirements within the Common Architecture Language Model.",
-  "type": "object",
-  "properties": {
-    "control-id": {
-      "type": "string",
-      "description": "The unique identifier of this control, which has the potential to be used for linking evidence"
-    },
-    "name": {
-      "type": "string",
-      "description": "The name of the control requirement that provides contextual meaning within a given domain"
-    },
-    "description": {
-      "type": "string",
-      "description": "A more detailed description of the control and information on what a developer needs to consider"
-    }
+  "control-id": {
+    "type": "string",
+    "description": "The unique identifier of this control, which has the potential to be used for linking evidence"
+  },
+  "name": {
+    "type": "string",
+    "description": "The name of the control requirement that provides contextual meaning within a given domain"
   },
   "required": [
     "control-id",
diff --git a/calm/draft/2024-08/meta/core.json b/calm/draft/2024-08/meta/core.json
index 1128d010..aaa1957f 100644
--- a/calm/draft/2024-08/meta/core.json
+++ b/calm/draft/2024-08/meta/core.json
@@ -2,26 +2,24 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/core.json",
   "title": "Common Architecture Language Model (CALM) Vocab",
-  "properties": {
-    "nodes": {
-      "type": "array",
-      "items": {
-        "$ref": "#/defs/node"
-      }
-    },
-    "relationships": {
-      "type": "array",
-      "items": {
-        "$ref": "#/defs/relationship"
-      }
-    },
-    "metadata": {
-      "$ref": "#/defs/metadata"
-    },
-    "controls": {
-      "$ref": "control.json#/defs/controls"
+  "nodes": {
+    "type": "array",
+    "items": {
+      "$ref": "#/defs/node"
     }
   },
+  "relationships": {
+    "type": "array",
+    "items": {
+      "$ref": "#/defs/relationship"
+    }
+  },
+  "metadata": {
+    "$ref": "#/defs/metadata"
+  },
+  "controls": {
+    "$ref": "control.json#/defs/controls"
+  },
   "defs": {
     "node": {
       "type": "object",
diff --git a/calm/draft/2024-08/meta/evidence.json b/calm/draft/2024-08/meta/evidence.json
index 8943d791..f4541300 100644
--- a/calm/draft/2024-08/meta/evidence.json
+++ b/calm/draft/2024-08/meta/evidence.json
@@ -3,28 +3,25 @@
   "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/evidence.json",
   "title": "Common Architecture Language Model Evidence",
   "description": "Schema for defining evidence for control requirements within the Common Architecture Language Model.",
-  "type": "object",
-  "properties": {
-    "evidence": {
-      "type": "object",
-      "properties": {
-        "unique-id": {
-          "type": "string",
-          "description": "CALM unique-id for future linking and uniquely defining this evidence"
-        },
-        "evidence-paths": {
-          "type": "array",
-          "description": "Paths to the evidence relating to a specific control",
-          "items": {
-            "type": "string"
-          }
-        },
-        "control-configuration-url": {
-          "type": "string",
-          "description": "URI for the control configuration this evidence relates to"
+  "evidence": {
+    "type": "object",
+    "properties": {
+      "unique-id": {
+        "type": "string",
+        "description": "CALM unique-id for future linking and uniquely defining this evidence"
+      },
+      "evidence-paths": {
+        "type": "array",
+        "description": "Paths to the evidence relating to a specific control",
+        "items": {
+          "type": "string"
         }
       },
-      "required":[
+      "control-configuration-url": {
+        "type": "string",
+        "description": "URI for the control configuration this evidence relates to"
+      },
+      "required": [
         "unique-id",
         "evidence-paths",
         "control-configuration-url"