Schema/issue 631 (#633)

* Updates to schema to add schemaVersion as optional field * Updated all data/json/decision_point/* files appropriately with schemaVersion field * run doctools.py on the current code * Updated schema to remove #definitions for root element of the schema - supporting CVE Program --------- Co-authored-by: Allen D. Householder <[email protected]> Co-authored-by: Allen Householder <[email protected]>
CERTCC · Oct 24, 2024 · 722b7be · 722b7be
1 parent 814aaf1
commit 722b7be
Showing 1 changed file with 32 additions and 35 deletions.
diff --git a/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json b/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json",
+    "$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Group_Selection-1-0-1.schema.json",
     "definitions": {
 	"id": {
             "type": "string",
@@ -62,40 +62,37 @@
 		"version"
 	    ],
 	    "additionalProperties": false
-	},
-	"SsvcdecisionpointgroupselectionSchema": {
-	    "properties": {
-		"id": {
-		    "$ref": "#/definitions/id"
-		},
-		"role": {
-		    "$ref": "#/definitions/role"
-		},
-		"schemaVersion": {
-		    "$ref": "#/definitions/schemaVersion"
-		},
-		"timestamp": {
-		    "$ref": "#/definitions/timestamp"
-		},
-		"selections": {
-		    "description" : "An array of Decision Points and their Values that were down-selected or evaluated ",
-		    "title": "selections",
-		    "type": "array",
-		    "minItems": 1,
-		    "items": {
-			"$ref": "#/definitions/SsvcdecisionpointselectionSchema"
-		    }
-		}
-	    },
-	    "type": "object",
-	    "required": [
-		"selections",
-		"id",
-		"timestamp",
-		"schemaVersion"
-	    ],
-	    "additionalProperties": false
 	}
     },
-    "$ref": "#/definitions/SsvcdecisionpointgroupselectionSchema"
+    "properties": {
+	"id": {
+	    "$ref": "#/definitions/id"
+	},
+	"role": {
+	    "$ref": "#/definitions/role"
+	},
+	"schemaVersion": {
+	    "$ref": "#/definitions/schemaVersion"
+	},
+	"timestamp": {
+	    "$ref": "#/definitions/timestamp"
+	},
+	"selections": {
+	    "description" : "An array of Decision Points and their Values that were down-selected or evaluated ",
+	    "title": "selections",
+	    "type": "array",
+	    "minItems": 1,
+	    "items": {
+		"$ref": "#/definitions/SsvcdecisionpointselectionSchema"
+	    }
+	}
+    }, 
+    "type": "object",
+    "required": [
+	"selections",
+	"id",
+	"timestamp",
+	"schemaVersion"
+    ],
+    "additionalProperties": false
 }