kvm/theia: Dont use allOf on resilient to extend properties

  allOf implies that all (both) schemas should be valid, but
    additionalProperties false wont allow it, since it become multually
    invalid. (You can validate only one or None)

  Just use $ref to expand the list, it end up with the expected outcome
   reducing complexity.

  Note: kvm wasn't using additionalProperties false but it was changed
   because it makes it future proof, in case we set it (we should set).

software/kvm/instance-kvm-resilient-input-schema.json

 {
   "type": "object",
   "$schema": "http://json-schema.org/draft-06/schema",
-  "allOf": [
-    {
-      "$ref": "./instance-kvm-input-schema.json#"
+  "description": "Parameters to instantiate resilient KVM",
+  "additionalProperties": false,
+  "properties": {
+    "$ref": "./instance-kvm-input-schema.json#/properties",
+    "resilient-clone-number": {
+      "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.",
+      "type": "integer",
+      "default": 1,
+      "optional": true
     },
-    {
-      "properties": {
-        "resilient-clone-number": {
-          "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.",
-          "type": "integer",
-          "default": 1,
-          "optional": true
-        },
-        "-sla-0-computer_guid": {
-          "title": "Target computer for main instance",
-          "description": "Target computer GUID for main instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-1-computer_guid": {
-          "title": "Target computer for first clone",
-          "description": "Target computer for first clone and PBS.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-pbs1-computer_guid": {
-          "title": "Target computer for first PBS",
-          "description": "Target computer for first PBS instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-2-computer_guid": {
-          "title": "Target computer for second clone",
-          "description": "Target computer for second clone and PBS.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-pbs2-computer_guid": {
-          "title": "Target computer for second PBS",
-          "description": "Target computer for second PBS instance.",
-          "type": "string",
-          "optional": true
-        },
-        "resiliency-backup-periodicity": {
-          "title": "Periodicity of backup",
-          "description": "Periodicity of backup, in cron format.",
-          "type": "string",
-          "optional": true
-        },
-        "remove-backup-older-than": {
-          "title": "Remove backups older than...",
-          "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
-          "type": "string",
-          "default": "2W",
-          "optional": true
-        }
-      }
+    "-sla-0-computer_guid": {
+      "title": "Target computer for main instance",
+      "description": "Target computer GUID for main instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-1-computer_guid": {
+      "title": "Target computer for first clone",
+      "description": "Target computer for first clone and PBS.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-pbs1-computer_guid": {
+      "title": "Target computer for first PBS",
+      "description": "Target computer for first PBS instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-2-computer_guid": {
+      "title": "Target computer for second clone",
+      "description": "Target computer for second clone and PBS.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-pbs2-computer_guid": {
+      "title": "Target computer for second PBS",
+      "description": "Target computer for second PBS instance.",
+      "type": "string",
+      "optional": true
+    },
+    "resiliency-backup-periodicity": {
+      "title": "Periodicity of backup",
+      "description": "Periodicity of backup, in cron format.",
+      "type": "string",
+      "optional": true
+    },
+    "remove-backup-older-than": {
+      "title": "Remove backups older than...",
+      "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
+      "type": "string",
+      "default": "2W",
+      "optional": true
     }
-  ]
+  }
 }

software/theia/instance-resilient-input-schema.json

@@ -2,65 +2,60 @@
   "$schema": "http://json-schema.org/draft-06/schema",
   "type": "object",
   "description": "Parameters to instantiate resilient Theia",
-  "allOf": [
-    {
-      "$ref": "./instance-input-schema.json#"
+  "additionalProperties": false,
+  "properties": {
+    "resilient-clone-number": {
+      "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.",
+      "type": "integer",
+      "default": 1,
+      "minimum": 0,
+      "maximum": 2,
+      "optional": true
     },
-    {
-      "properties": {
-        "resilient-clone-number": {
-          "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.",
-          "type": "integer",
-          "default": 1,
-          "minimum": 0,
-          "maximum": 2,
-          "optional": true
-        },
-        "-sla-theia0-computer_guid": {
-          "title": "Target computer for main instance",
-          "description": "Target computer GUID for main instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-theia1-computer_guid": {
-          "title": "Target computer for first clone",
-          "description": "Target computer for first clone instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-pbs1-computer_guid": {
-          "title": "Target computer for first PBS",
-          "description": "Target computer for first PBS instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-theia2-computer_guid": {
-          "title": "Target computer for second clone",
-          "description": "Target computer for second clone instance.",
-          "type": "string",
-          "optional": true
-        },
-        "-sla-pbs2-computer_guid": {
-          "title": "Target computer for second PBS",
-          "description": "Target computer for second PBS instance.",
-          "type": "string",
-          "optional": true
-        },
-        "resiliency-backup-periodicity": {
-          "title": "Periodicity of backup",
-          "description": "Periodicity of backup, in cron format.",
-          "type": "string",
-          "optional": true
-        },
-        "remove-backup-older-than": {
-          "title": "Remove backups older than...",
-          "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
-          "type": "string",
-          "default": "2W",
-          "optional": true
-        }
-      }
-    }
-  ]
+    "-sla-theia0-computer_guid": {
+      "title": "Target computer for main instance",
+      "description": "Target computer GUID for main instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-theia1-computer_guid": {
+      "title": "Target computer for first clone",
+      "description": "Target computer for first clone instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-pbs1-computer_guid": {
+      "title": "Target computer for first PBS",
+      "description": "Target computer for first PBS instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-theia2-computer_guid": {
+      "title": "Target computer for second clone",
+      "description": "Target computer for second clone instance.",
+      "type": "string",
+      "optional": true
+    },
+    "-sla-pbs2-computer_guid": {
+      "title": "Target computer for second PBS",
+      "description": "Target computer for second PBS instance.",
+      "type": "string",
+      "optional": true
+    },
+    "resiliency-backup-periodicity": {
+      "title": "Periodicity of backup",
+      "description": "Periodicity of backup, in cron format.",
+      "type": "string",
+      "optional": true
+    },
+    "remove-backup-older-than": {
+      "title": "Remove backups older than...",
+      "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
+      "type": "string",
+      "default": "2W",
+      "optional": true
+    },
+    "$ref": "./instance-input-schema.json#/properties"
+  }
 }

[Xavier Thompson]

I think this change is responsible for json-schemas now failing on master for theia and kvm.