slapos_jio: Update meta schemas to draft7

d81fed78 · Rafael Monnerat · fc90cdb6 · d81fed78 · d81fed78 · d81fed78
Commit d81fed78 authored Oct 19, 2022 by Rafael Monnerat
4 changed files
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_meta_schema_json.txt
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_meta_schema_json.txt
 {
-    "id": "http://json-schema.org/draft-04/schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Core schema meta-schema",
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Core schema meta-schema",
    "definitions": {
        "schemaArray": {
            "type": "array",
            "minItems": 1,
            "items": { "$ref": "#" }
        },
-        "positiveInteger": {
+        "nonNegativeInteger": {
            "type": "integer",
            "minimum": 0
        },
-        "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+        "nonNegativeIntegerDefault0": {
+            "allOf": [
+                { "$ref": "#/definitions/nonNegativeInteger" },
+                { "default": 0 }
+            ]
        },
        "simpleTypes": {
-            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
+            "enum": [
+                "array",
+                "boolean",
+                "integer",
+                "null",
+                "number",
+                "object",
+                "string"
+            ]
        },
        "stringArray": {
            "type": "array",
            "items": { "type": "string" },
-            "minItems": 1,
-            "uniqueItems": true
+            "uniqueItems": true,
+            "default": []
        }
    },
-    "type": "object",
+    "type": ["object", "boolean"],
    "properties": {
-        "id": {
-            "type": "string",
-            "format": "uri"
+        "$id": {
+            "type": "string"
        },
        "$schema": {
-            "type": "string",
-            "format": "uri"
+            "type": "string"
+        },
+        "$ref": {
+            "type": "string"
+        },
+        "$comment": {
+            "type": "string"
        },
        "title": {
            "type": "string"
@@ -41,62 +55,59 @@
        "description": {
            "type": "string"
        },
-        "default": {},
+        "default": true,
+        "readOnly": {
+            "type": "boolean",
+            "default": false
+        },
+        "writeOnly": {
+            "type": "boolean",
+            "default": false
+        },
+        "examples": {
+            "type": "array",
+            "items": true
+        },
        "multipleOf": {
            "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
+            "exclusiveMinimum": 0
        },
        "maximum": {
            "type": "number"
        },
        "exclusiveMaximum": {
-            "type": "boolean",
-            "default": false
+            "type": "number"
        },
        "minimum": {
            "type": "number"
        },
        "exclusiveMinimum": {
-            "type": "boolean",
-            "default": false
+            "type": "number"
        },
-        "maxLength": { "$ref": "#/definitions/positiveInteger" },
-        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "maxLength": { "$ref": "#/definitions/nonNegativeInteger" },
+        "minLength": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
        "pattern": {
-            "type": "string",
-            "format": "regex"
-        },
-        "additionalItems": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
+            "type": "string"
        },
+        "additionalItems": { "$ref": "#" },
        "items": {
            "anyOf": [
                { "$ref": "#" },
                { "$ref": "#/definitions/schemaArray" }
            ],
-            "default": {}
+            "default": true
        },
-        "maxItems": { "$ref": "#/definitions/positiveInteger" },
-        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "maxItems": { "$ref": "#/definitions/nonNegativeInteger" },
+        "minItems": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
        "uniqueItems": {
            "type": "boolean",
            "default": false
        },
-        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
-        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "contains": { "$ref": "#" },
+        "maxProperties": { "$ref": "#/definitions/nonNegativeInteger" },
+        "minProperties": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
        "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
+        "additionalProperties": { "$ref": "#" },
        "definitions": {
            "type": "object",
            "additionalProperties": { "$ref": "#" },
@@ -110,6 +121,7 @@
        "patternProperties": {
            "type": "object",
            "additionalProperties": { "$ref": "#" },
+            "propertyNames": {},
            "default": {}
        },
        "dependencies": {
@@ -121,8 +133,11 @@
                ]
            }
        },
+        "propertyNames": { "$ref": "#" },
+        "const": true,
        "enum": {
            "type": "array",
+            "items": true,
            "minItems": 1,
            "uniqueItems": true
        },
@@ -137,14 +152,16 @@
                }
            ]
        },
+        "format": { "type": "string" },
+        "contentMediaType": { "type": "string" },
+        "contentEncoding": { "type": "string" },
+        "if": { "$ref": "#" },
+        "then": { "$ref": "#" },
+        "else": { "$ref": "#" },
        "allOf": { "$ref": "#/definitions/schemaArray" },
        "anyOf": { "$ref": "#/definitions/schemaArray" },
        "oneOf": { "$ref": "#/definitions/schemaArray" },
        "not": { "$ref": "#" }
    },
-    "dependencies": {
-        "exclusiveMaximum": [ "maximum" ],
-        "exclusiveMinimum": [ "minimum" ]
-    },
-    "default": {}
+    "default": true
 }
\ No newline at end of file
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_meta_schema_json.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_meta_schema_json.xml
@@ -240,7 +240,7 @@
                  </item>
                  <item>
                      <key> <string>serial</string> </key>
-                      <value> <string>999.27453.45440.44629</string> </value>
+                      <value> <string>1003.46346.29825.45516</string> </value>
                  </item>
                  <item>
                      <key> <string>state</string> </key>
@@ -258,7 +258,7 @@
                          </tuple>
                          <state>
                            <tuple>
-                              <float>1649434525.63</float>
+                              <float>1666036519.04</float>
                              <string>UTC</string>
                            </tuple>
                          </state>

--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_software_schema_json.txt
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_software_schema_json.txt
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
  "description": "Slapos Software Release instantiation descriptor",
  "additionalProperties": false,
  "required": [

--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_software_schema_json.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_slapos_load_software_schema_json.xml
@@ -239,7 +239,7 @@ https://lab.nexedi.com/nexedi/slapos/raw/master/schema.json#</string> </value>
                  </item>
                  <item>
                      <key> <string>serial</string> </key>
-                      <value> <string>999.32250.5458.58606</string> </value>
+                      <value> <string>1003.46353.55894.19370</string> </value>
                  </item>
                  <item>
                      <key> <string>state</string> </key>
@@ -257,7 +257,7 @@ https://lab.nexedi.com/nexedi/slapos/raw/master/schema.json#</string> </value>
                          </tuple>
                          <state>
                            <tuple>
-                              <float>1649721266.53</float>
+                              <float>1666036947.97</float>
                              <string>UTC</string>
                            </tuple>
                          </state>