Update JSON Schema version to Draft 2020-12

api_app/_version.py

@@ -1 +1 @@
-__version__ = "0.25.29"
+__version__ = "0.26.0"

api_app/models/schemas/shared_service_template.py

@@ -44,7 +44,7 @@ class Config:
                 "version": "0.0.1",
                 "current": "true",
                 "json_schema": {
-                    "$schema": "http://json-schema.org/draft-07/schema",
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/myshared_service/shared_service.json",
                     "type": "object",
                     "title": "My Shared Service Template",

api_app/models/schemas/user_resource_template.py

@@ -44,7 +44,7 @@ class Config:
                 "version": "0.0.1",
                 "current": "true",
                 "json_schema": {
-                    "$schema": "http://json-schema.org/draft-07/schema",
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/user_resource.json",
                     "type": "object",
                     "title": "My User Resource Template",

api_app/models/schemas/workspace_service_template.py

@@ -45,7 +45,7 @@ class Config:
                 "version": "0.0.1",
                 "current": "true",
                 "json_schema": {
-                    "$schema": "http://json-schema.org/draft-07/schema",
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
                     "type": "object",
                     "title": "My Workspace Service Template",

api_app/models/schemas/workspace_template.py

@@ -49,7 +49,7 @@ class Config:
                 "version": "0.0.1",
                 "current": "true",
                 "json_schema": {
-                    "$schema": "http://json-schema.org/draft-07/schema",
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace.json",
                     "type": "object",
                     "title": "My Workspace Template",

api_app/schemas/azuread.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/schema/azuread.json",
     "type": "object",
     "title": "Azure AD Authorisation Schema",

api_app/schemas/shared_service.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/schema/shared_service.json",
   "type": "object",
   "title": "Shared Service Default Parameters",

api_app/schemas/user_resource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/schema/user_resource.json",
   "type": "object",
   "title": "User Resource Default Parameters",

api_app/schemas/workspace.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/schema/workspace.json",
   "type": "object",
   "title": "Workspace Default Parameters",

api_app/schemas/workspace_service.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/schema/workspace_service.json",
   "type": "object",
   "title": "Workspace Service Default Parameters",

api_app/tests_ma/conftest.py

@@ -36,7 +36,7 @@ def input_workspace_template():
         version="0.0.1",
         current=True,
         json_schema={
-            "$schema": "http://json-schema.org/draft-07/schema",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
             "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace.json",
             "type": "object",
             "title": "My Workspace Template",
@@ -101,7 +101,7 @@ def input_workspace_service_template():
         version="0.0.1",
         current=True,
         json_schema={
-            "$schema": "http://json-schema.org/draft-07/schema",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
             "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
             "type": "object",
             "title": "My Workspace Service Template",
@@ -122,7 +122,7 @@ def input_user_resource_template():
         version="0.0.1",
         current=True,
         json_schema={
-            "$schema": "http://json-schema.org/draft-07/schema",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
             "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/user_resource.json",
             "type": "object",
             "title": "My User Resource Template",
@@ -143,7 +143,7 @@ def input_shared_service_template():
         version="0.0.1",
         current=True,
         json_schema={
-            "$schema": "http://json-schema.org/draft-07/schema",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
             "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/mysharedservice/shared_service.json",
             "type": "object",
             "title": "My Shared Service Template",

api_http_requests/API Template Modifying Endpoints.http

@@ -10,7 +10,7 @@ Content-Type: {{contentType}}
   "version": "0.0.3",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace.json",
     "type": "object",
     "title": "My Workspace Template",
@@ -55,7 +55,7 @@ Content-Type: {{contentType}}
   "version": "0.0.1",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
     "type": "object",
     "title": "My Workspace Service Template",
@@ -77,7 +77,7 @@ Content-Type: {{contentType}}
   "version": "0.0.1",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/user_resource.json",
     "type": "object",
     "title": "My User Resource Template",

api_http_requests/API User Journey.http

@@ -12,7 +12,7 @@ Content-Type: {{contentType}}
   "version": "0.0.3",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace.json",
     "type": "object",
     "title": "My Workspace Template",
@@ -57,7 +57,7 @@ Content-Type: {{contentType}}
   "version": "0.0.1",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
     "type": "object",
     "title": "My Workspace Service Template",
@@ -79,7 +79,7 @@ Content-Type: {{contentType}}
   "version": "0.0.1",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/user_resource.json",
     "type": "object",
     "title": "My User Resource Template",

docs/schemas/operation.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "type": "object",
     "properties": {
         "id": {

docs/schemas/resource-assignment.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "type": "object",
     "properties": {
         "id": {

docs/schemas/resource.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "type": "object",
     "properties": {
         "id": {

docs/tre-templates/pipeline-templates/overview.md

@@ -10,7 +10,7 @@ Consider the following `template_schema.json`:
 
 ```json
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/workspace_services/guacamole/user_resources/guacamole-dev-vm/template_schema.json",
   ...
   "properties": {...},

docs/tre-workspace-authors/authoring-workspace-templates.md

@@ -74,7 +74,17 @@ Similarly to `tre_id`, `workspace_id` is used in the resource names of the works
 
 All the values for the required parameters will be provided by the deployment runner.
 
-Any **custom parameters** are picked up by Azure TRE API and will be queried from the user deploying the workspace bundle. Custom parameters should also be defined in the `template_schema.json` file at the root of the bundle. This file follows the [JSON schema standard](http://json-schema.org/) and can be used by a user interface to generate a UI for the user to input the parameters.
+Any **custom parameters** are picked up by Azure TRE API and will be queried from the user deploying the workspace bundle. Custom parameters should also be defined in the `template_schema.json` file at the root of the bundle. This file follows the [JSON schema standard](https://json-schema.org/) Draft 2020-12 (`https://json-schema.org/draft/2020-12/schema`) and can be used by a user interface to generate a UI for the user to input the parameters.
+
+### JSON Schema Version Standard
+
+Azure TRE template schemas (`template_schema.json`) use the **JSON Schema Draft 2020-12** specification:
+
+```json
+"$schema": "https://json-schema.org/draft/2020-12/schema"
+```
+
+Draft 2020-12 is supported by the API schema validation engine and supports new keywords such as `unevaluatedProperties`. The Azure TRE API automatically sets `unevaluatedProperties: false` on template schemas to prevent unspecified parameters from being supplied, including when evaluating conditional schemas defined with `allOf`.
 
 ### Template properties
 

e2e_tests/test.http

@@ -63,7 +63,7 @@ Content-type: application/json
   "version": "0.0.1",
   "current": "true",
   "json_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
     "type": "object",
     "title": "DONOTUSE - E2E workspace service",

e2e_tests/test_workspace_service_templates.py

@@ -45,7 +45,7 @@ async def test_create_workspace_service_templates(verify) -> None:
             "version": "0.0.1",
             "current": "true",
             "json_schema": {
-                "$schema": "http://json-schema.org/draft-07/schema",
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "$id": "https://github.com/microsoft/AzureTRE/templates/workspaces/myworkspace/workspace_service.json",
                 "type": "object",
                 "title": "DONOTUSE",

templates/shared_services/admin-vm/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-admin-vm
-version: 0.5.4
+version: 0.5.5
 description: "An admin vm shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/shared_services/admin-vm/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/admin-vm/template_schema.json",
   "type": "object",
   "title": "Admin VM Shared Service",

templates/shared_services/airlock_notifier/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-airlock-notifier
-version: 1.0.10
+version: 1.0.11
 description: "A shared service notifying on Airlock Operations"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/airlock_notifier/template_schema.json

@@ -1,5 +1,5 @@
  {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/airlock_notifier/template_schema.json",
   "type": "object",
   "title": "Airlock Notifier Shared Service",

templates/shared_services/certs/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-certs
-version: 0.7.10
+version: 0.7.11
 description: "An Azure TRE shared service to generate certificates for a specified internal domain using Letsencrypt"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/certs/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/certs/template_schema.json",
   "type": "object",
   "title": "Certificate Service",

templates/shared_services/cyclecloud/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-cyclecloud
-version: 0.7.5
+version: 0.7.6
 description: "An Azure TRE Shared Service Template for Azure Cyclecloud"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/cyclecloud/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json",
   "type": "object",
   "title": "Azure CycleCloud",

templates/shared_services/databricks-auth/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-databricks-private-auth
-version: 0.1.14
+version: 0.1.15
 description: "An Azure TRE shared service for Azure Databricks authentication."
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/databricks-auth/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/databricks-auth/template_schema.json",
   "type": "object",
   "title": "Azure Databricks Private Authentication Shared Service",

templates/shared_services/firewall/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-firewall
-version: 1.6.1
+version: 1.6.2
 description: "An Azure TRE Firewall shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/shared_services/firewall/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/firewall/template_schema.json",
   "type": "object",
   "title": "Firewall Shared Service",

templates/shared_services/gitea/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-gitea
-version: 1.2.2
+version: 1.2.3
 description: "A Gitea shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/shared_services/gitea/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/gitea/template_schema.json",
   "type": "object",
   "title": "Gitea - Git Mirror",

templates/shared_services/sonatype-nexus-vm/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-sonatype-nexus
-version: 3.10.0
+version: 3.10.1
 description: "A Sonatype Nexus shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/shared_services/sonatype-nexus-vm/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/shared_services/sonatype-nexus-vm/template_schema.json",
   "type": "object",
   "title": "Sonatype Nexus Repository Manager",

templates/workspace_services/azureml/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-azureml
-version: 1.1.4
+version: 1.1.5
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/workspace_services/azureml/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/workspace_services/azureml/template_schema.json",
   "type": "object",
   "title": "Azure Machine Learning",

templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-user-resource-aml-compute-instance
-version: 0.5.12
+version: 0.5.13
 description: "Azure Machine Learning Compute Instance"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/workspace_services/azureml/user_resources/aml_compute/template_schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/microsoft/AzureTRE/templates/workspace_services/azureml/user_resources/aml_compute/custom_parameters.json",
   "type": "object",
   "title": "Azure Machine Learning Compute Instance",

templates/workspace_services/azuresql/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-workspace-service-azuresql
-version: 1.0.17
+version: 1.0.18
 description: "An Azure SQL workspace service"
 registry: azuretre
 dockerfile: Dockerfile.tmpl