software/erp5: use allOf to extend caucase schema

cbb33e56 · Jérome Perrin · 17ac5551 · cbb33e56
Commit cbb33e56 authored Jun 13, 2022 by Jérome Perrin
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 11 deletions

software/erp5/instance-erp5-input-schema.json software/erp5/instance-erp5-input-schema.json +15 -11

No files found.
--- a/software/erp5/instance-erp5-input-schema.json
+++ b/software/erp5/instance-erp5-input-schema.json
@@ -498,18 +498,22 @@
    },
    "caucase": {
      "description": "Caucase certificate authority parameters",
-      "properties": {
+      "allOf": [
-        "url": {
+        {
-          "title": "Caucase URL",
+          "properties": {
-          "description": "URL of existing caucase instance to use. If empty, a new caucase instance will be deployed. If not empty, other properties in this section will be ignored.",
+            "url": {
-          "default": "",
+              "title": "Caucase URL",
-          "type": "string",
+              "description": "URL of existing caucase instance to use. If empty, a new caucase instance will be deployed. If not empty, other properties in this section will be ignored.",
-          "format": "uri"
+              "default": "",
+              "type": "string",
+              "format": "uri"
+            }
+          }
+        },
+        {
+          "$ref": "../caucase/instance-caucase-input-schema.json"
        }
-      },
+      ],
-      "additionalProperties": {
-        "$ref": "../caucase/instance-caucase-input-schema.json"
-      },
      "type": "object"
    },
    "test-runner": {