software/{kvm,theia}: use unevaluatedProperties for schema composition

This is based on example from https://json-schema.org/understanding-json-schema/reference/object#unevaluatedproperties
this approach allows extending a schema from another software type with
some extra properties while rejecting other properties on instances,
like it's done with additionalProperties: false.

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

@@ -2,65 +2,62 @@
   "type": "object",
   "$schema": "https://json-schema.org/draft/2020-12/schema#",
   "description": "Parameters to instantiate resilient KVM",
+  "unevaluatedProperties": false,
   "allOf": [
     {
-      "$ref": "./instance-kvm-input-schema.json#",
-      "additionalProperties": true
+      "$ref": "./instance-kvm-input-schema.json#/$defs/instance-parameters"
+    }
+  ],
+  "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
     },
-    {
-      "additionalProperties": 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-input-schema.json

 {
-  "$schema": "http://json-schema.org/draft-06/schema#",
-  "type": "object",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "description": "Parameters to instantiate Theia",
-  "additionalProperties": false,
-  "properties": {
-    "autorun": {
-      "title": "Automatically Run Software/Instance",
-      "description": "The option used to pilot automatic build and run of software and instances hosted inside Theia. When 'running', build and run is done automatically in the background. When 'stopped' build and run processes are stopped and need to be run manually. When 'user-controlled', the user can manage it directly in the local supervisord. ",
-      "type": "string",
-      "enum": [
-        "running",
-        "stopped",
-        "user-controlled"
-      ],
-      "default": "running"
-    },
-    "initial-embedded-instance": {
-      "title": "Initial Embedded Instance Configuration",
-      "description": "One-shot optional JSON preconfiguration for an embedded instance. Only applied once when Theia is instantiated. Changing this option afterward will have no effect.",
-      "type": "string",
-      "textarea": true,
-      "examples": [
-        "{\"software-url\": \"~/srv/project/slapos/software/html5as-base/software.cfg\"}",
-        "{\"software-url\": \"~/srv/project/slapos/software/html5as/software.cfg\", \"software-type\": \"replicate\", \"instance-parameters\": {\"replicate-quantity\": 3}}"
-      ]
-    },
-    "forward-slapos-frontend-requests": {
-      "title": "Forward Frontend Requests in the Embedded SlapOS",
-      "description": "Embedded SlapOS instance by default forwards frontend requests as shared instances attached to the Theia instance, so that HTTP frontends can be allocated for services. This behavior can be disabled, in that case frontends will not be allocated.",
-      "type": "string",
-      "enum": [
-        "enabled",
-        "disabled"
-      ],
-      "default": "enabled"
-    },
-    "frontend-guid": {
-      "title": "Frontend Instance ID",
-      "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
-      "type": "string"
-    },
-    "frontend-sr": {
-      "title": "Frontend Software URL",
-      "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
-      "type": "string",
-      "format": "uri",
-      "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
-    },
-    "frontend-sr-type": {
-      "title": "Frontend Software Type",
-      "description": "Type of the frontend instance, like \"frontend\".",
-      "type": "string",
-      "default": "RootSoftwareInstance"
-    },
-    "additional-frontend-guid": {
-      "title": "Additional Frontend Instance ID",
-      "description": "Unique identifier of the additional frontend instance, like \"SOFTINST-11031\", if empty won't be requested.",
-      "type": "string"
-    },
-    "additional-frontend-sr": {
-      "title": "Additional Frontend Software URL",
-      "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
-      "type": "string",
-      "format": "uri",
-      "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
-    },
-    "additional-frontend-sr-type": {
-      "title": "Additional Frontend Software Type",
-      "description": "Type of the frontend instance, like \"frontend\".",
-      "type": "string",
-      "default": "RootSoftwareInstance"
+  "$defs": {
+    "instance-parameters": {
+      "type": "object",
+      "properties": {
+        "autorun": {
+          "title": "Automatically Run Software/Instance",
+          "description": "The option used to pilot automatic build and run of software and instances hosted inside Theia. When 'running', build and run is done automatically in the background. When 'stopped' build and run processes are stopped and need to be run manually. When 'user-controlled', the user can manage it directly in the local supervisord. ",
+          "type": "string",
+          "enum": [
+            "running",
+            "stopped",
+            "user-controlled"
+          ],
+          "default": "running"
+        },
+        "initial-embedded-instance": {
+          "title": "Initial Embedded Instance Configuration",
+          "description": "One-shot optional JSON preconfiguration for an embedded instance. Only applied once when Theia is instantiated. Changing this option afterward will have no effect.",
+          "type": "string",
+          "textarea": true,
+          "examples": [
+            "{\"software-url\": \"~/srv/project/slapos/software/html5as-base/software.cfg\"}",
+            "{\"software-url\": \"~/srv/project/slapos/software/html5as/software.cfg\", \"software-type\": \"replicate\", \"instance-parameters\": {\"replicate-quantity\": 3}}"
+          ]
+        },
+        "forward-slapos-frontend-requests": {
+          "title": "Forward Frontend Requests in the Embedded SlapOS",
+          "description": "Embedded SlapOS instance by default forwards frontend requests as shared instances attached to the Theia instance, so that HTTP frontends can be allocated for services. This behavior can be disabled, in that case frontends will not be allocated.",
+          "type": "string",
+          "enum": [
+            "enabled",
+            "disabled"
+          ],
+          "default": "enabled"
+        },
+        "frontend-guid": {
+          "title": "Frontend Instance ID",
+          "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
+          "type": "string"
+        },
+        "frontend-sr": {
+          "title": "Frontend Software URL",
+          "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
+          "type": "string",
+          "format": "uri",
+          "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
+        },
+        "frontend-sr-type": {
+          "title": "Frontend Software Type",
+          "description": "Type of the frontend instance, like \"frontend\".",
+          "type": "string",
+          "default": "RootSoftwareInstance"
+        },
+        "additional-frontend-guid": {
+          "title": "Additional Frontend Instance ID",
+          "description": "Unique identifier of the additional frontend instance, like \"SOFTINST-11031\", if empty won't be requested.",
+          "type": "string"
+        },
+        "additional-frontend-sr": {
+          "title": "Additional Frontend Software URL",
+          "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
+          "type": "string",
+          "format": "uri",
+          "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
+        },
+        "additional-frontend-sr-type": {
+          "title": "Additional Frontend Software Type",
+          "description": "Type of the frontend instance, like \"frontend\".",
+          "type": "string",
+          "default": "RootSoftwareInstance"
+        }
+      }
     }
-  }
+  },
+  "unevaluatedProperties": false,
+  "allOf": [
+    {
+      "$ref": "#/$defs/instance-parameters"
+    }
+  ]
 }

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

 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "type": "object",
   "description": "Parameters to instantiate resilient Theia",
+  "unevaluatedProperties": false,
   "allOf": [
     {
-      "$ref": "./instance-input-schema.json#",
-      "additionalProperties": true
+      "$ref": "./instance-input-schema.json#/$defs/instance-parameters"
+    }
+  ],
+  "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
     },
-    {
-      "additionalProperties": 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
     }
-  ]
+  }
 }