Commit df5d4f60 authored by Rafael Monnerat's avatar Rafael Monnerat

kvm/theia: fixup resilient schema

  You cannot expand properties with  since it expects
  to be an object or boolean.

  Revert to use allOf back, however set additionalProperties true,
  so the schemas are mutually partially valid.

  Other solutions might too verbose or too restrictive to the use
  case (or simply invalid).
parent 05cf6b5a
...@@ -2,9 +2,14 @@ ...@@ -2,9 +2,14 @@
"type": "object", "type": "object",
"$schema": "https://json-schema.org/draft/2020-12/schema#", "$schema": "https://json-schema.org/draft/2020-12/schema#",
"description": "Parameters to instantiate resilient KVM", "description": "Parameters to instantiate resilient KVM",
"additionalProperties": false, "allOf": [
{
"$ref": "./instance-kvm-input-schema.json#",
"additionalProperties": true,
},
{
"additionalProperties": true,
"properties": { "properties": {
"$ref": "./instance-kvm-input-schema.json#/properties",
"resilient-clone-number": { "resilient-clone-number": {
"title": "Amount of backup(s) to create", "title": "Amount of backup(s) to create",
"description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.", "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.",
...@@ -56,4 +61,6 @@ ...@@ -56,4 +61,6 @@
"optional": true "optional": true
} }
} }
}
]
} }
...@@ -2,7 +2,13 @@ ...@@ -2,7 +2,13 @@
"$schema": "https://json-schema.org/draft/2020-12/schema#", "$schema": "https://json-schema.org/draft/2020-12/schema#",
"type": "object", "type": "object",
"description": "Parameters to instantiate resilient Theia", "description": "Parameters to instantiate resilient Theia",
"additionalProperties": false, "allOf": [
{
"$ref": "./instance-input-schema.json#",
"additionalProperties": true
},
{
"additionalProperties": true,
"properties": { "properties": {
"resilient-clone-number": { "resilient-clone-number": {
"title": "Amount of backup(s) to create", "title": "Amount of backup(s) to create",
...@@ -55,7 +61,8 @@ ...@@ -55,7 +61,8 @@
"type": "string", "type": "string",
"default": "2W", "default": "2W",
"optional": true "optional": true
},
"$ref": "./instance-input-schema.json#/properties"
} }
}
}
]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment