From a9d5429d8edca50163cf62d074a5517f95e0428c Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Tue, 2 Mar 2021 17:18:48 -0500 Subject: [PATCH 1/2] Add metadata field to JSON schema --- schemas/2014-04-01-preview/deploymentTemplate.json | 4 ++++ schemas/2015-01-01/deploymentTemplate.json | 4 ++++ schemas/2018-05-01/subscriptionDeploymentTemplate.json | 4 ++++ schemas/2019-03-01-hybrid/deploymentTemplate.json | 8 ++++++++ schemas/2019-04-01/deploymentTemplate.json | 4 ++++ schemas/2019-08-01/managementGroupDeploymentTemplate.json | 4 ++++ schemas/2019-08-01/tenantDeploymentTemplate.json | 4 ++++ .../templateTests/ManagementGroupTemplate.2019-08-01.json | 4 ++++ tools/templateTests/SubscriptionTemplate.2018-05-01.json | 4 ++++ tools/templateTests/Template_1.2014-01-01-preview.json | 4 ++++ tools/templateTests/Template_1.2015-01-01.json | 4 ++++ tools/templateTests/Template_1.2019-03-01-hybrid.json | 4 ++++ tools/templateTests/Template_1.2019-04-01.json | 4 ++++ tools/templateTests/Template_2.2014-01-01-preview.json | 4 ++++ tools/templateTests/Template_2.2015-01-01.json | 4 ++++ tools/templateTests/Template_2.2019-03-01-hybrid.json | 4 ++++ tools/templateTests/Template_2.2019-04-01.json | 4 ++++ tools/templateTests/Template_3.2015-01-01.json | 4 ++++ tools/templateTests/Template_3.2019-03-01-hybrid.json | 4 ++++ tools/templateTests/Template_3.2019-04-01.json | 4 ++++ tools/templateTests/TenantTemplate.2019-08-01.json | 4 ++++ 21 files changed, 88 insertions(+) diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json index eaa81549f9..5e24dc8ae7 100644 --- a/schemas/2014-04-01-preview/deploymentTemplate.json +++ b/schemas/2014-04-01-preview/deploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "contentVersion": { "type": "string", "pattern": "(^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$)", diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index aaa05c7373..34fc6ddc49 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "apiProfile": { "type": "string", "enum": [ diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json index 8e614c5cd0..fc5623d9e1 100644 --- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json +++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "apiProfile": { "type": "string", "enum": [ diff --git a/schemas/2019-03-01-hybrid/deploymentTemplate.json b/schemas/2019-03-01-hybrid/deploymentTemplate.json index 1c93b4b39d..c64292ee19 100644 --- a/schemas/2019-03-01-hybrid/deploymentTemplate.json +++ b/schemas/2019-03-01-hybrid/deploymentTemplate.json @@ -11,6 +11,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "contentVersion": { "type": "string", "pattern": "(^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$)", @@ -126,6 +130,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "contentVersion": { "type": "string", "pattern": "(^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$)", diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json index 115f5138b3..ee6b8f4d56 100644 --- a/schemas/2019-04-01/deploymentTemplate.json +++ b/schemas/2019-04-01/deploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "apiProfile": { "type": "string", "enum": [ diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json index 14b9d94868..6060eacae4 100644 --- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json +++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "apiProfile": { "type": "string", "enum": [ diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json index 805e8b6206..984876302b 100644 --- a/schemas/2019-08-01/tenantDeploymentTemplate.json +++ b/schemas/2019-08-01/tenantDeploymentTemplate.json @@ -9,6 +9,10 @@ "type": "string", "description": "JSON schema reference" }, + "metadata": { + "type": "object", + "additionalProperties": true + }, "apiProfile": { "type": "string", "enum": [ diff --git a/tools/templateTests/ManagementGroupTemplate.2019-08-01.json b/tools/templateTests/ManagementGroupTemplate.2019-08-01.json index 934402698d..f3030ce7e5 100644 --- a/tools/templateTests/ManagementGroupTemplate.2019-08-01.json +++ b/tools/templateTests/ManagementGroupTemplate.2019-08-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { diff --git a/tools/templateTests/SubscriptionTemplate.2018-05-01.json b/tools/templateTests/SubscriptionTemplate.2018-05-01.json index 87d8da63aa..f603970c0d 100644 --- a/tools/templateTests/SubscriptionTemplate.2018-05-01.json +++ b/tools/templateTests/SubscriptionTemplate.2018-05-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { diff --git a/tools/templateTests/Template_1.2014-01-01-preview.json b/tools/templateTests/Template_1.2014-01-01-preview.json index d91dfb88f3..d1f242e132 100644 --- a/tools/templateTests/Template_1.2014-01-01-preview.json +++ b/tools/templateTests/Template_1.2014-01-01-preview.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { diff --git a/tools/templateTests/Template_1.2015-01-01.json b/tools/templateTests/Template_1.2015-01-01.json index 73d8f75dfb..cba3207b8b 100644 --- a/tools/templateTests/Template_1.2015-01-01.json +++ b/tools/templateTests/Template_1.2015-01-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { diff --git a/tools/templateTests/Template_1.2019-03-01-hybrid.json b/tools/templateTests/Template_1.2019-03-01-hybrid.json index 15b47b91af..ce4b03e41c 100644 --- a/tools/templateTests/Template_1.2019-03-01-hybrid.json +++ b/tools/templateTests/Template_1.2019-03-01-hybrid.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-03-01-hybrid/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "keyvaultSettings": { diff --git a/tools/templateTests/Template_1.2019-04-01.json b/tools/templateTests/Template_1.2019-04-01.json index 4ca68d3249..f7722fcca6 100644 --- a/tools/templateTests/Template_1.2019-04-01.json +++ b/tools/templateTests/Template_1.2019-04-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { diff --git a/tools/templateTests/Template_2.2014-01-01-preview.json b/tools/templateTests/Template_2.2014-01-01-preview.json index ab2f81141f..fb8a3f0664 100644 --- a/tools/templateTests/Template_2.2014-01-01-preview.json +++ b/tools/templateTests/Template_2.2014-01-01-preview.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "name": { diff --git a/tools/templateTests/Template_2.2015-01-01.json b/tools/templateTests/Template_2.2015-01-01.json index 6d1d49d8b9..349f37e115 100644 --- a/tools/templateTests/Template_2.2015-01-01.json +++ b/tools/templateTests/Template_2.2015-01-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "name": { diff --git a/tools/templateTests/Template_2.2019-03-01-hybrid.json b/tools/templateTests/Template_2.2019-03-01-hybrid.json index 102d611fa4..d6136951c6 100644 --- a/tools/templateTests/Template_2.2019-03-01-hybrid.json +++ b/tools/templateTests/Template_2.2019-03-01-hybrid.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-03-01-hybrid/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, diff --git a/tools/templateTests/Template_2.2019-04-01.json b/tools/templateTests/Template_2.2019-04-01.json index f1758fb083..f267ce6046 100644 --- a/tools/templateTests/Template_2.2019-04-01.json +++ b/tools/templateTests/Template_2.2019-04-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "name": { diff --git a/tools/templateTests/Template_3.2015-01-01.json b/tools/templateTests/Template_3.2015-01-01.json index c1a37cf105..126c729415 100644 --- a/tools/templateTests/Template_3.2015-01-01.json +++ b/tools/templateTests/Template_3.2015-01-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "virtualNetworkName": { diff --git a/tools/templateTests/Template_3.2019-03-01-hybrid.json b/tools/templateTests/Template_3.2019-03-01-hybrid.json index bc4c1fc2a9..2e38f8f38a 100644 --- a/tools/templateTests/Template_3.2019-03-01-hybrid.json +++ b/tools/templateTests/Template_3.2019-03-01-hybrid.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-03-01-hybrid/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "adminUsername": { diff --git a/tools/templateTests/Template_3.2019-04-01.json b/tools/templateTests/Template_3.2019-04-01.json index d3c4a4d77f..61dfcdfd39 100644 --- a/tools/templateTests/Template_3.2019-04-01.json +++ b/tools/templateTests/Template_3.2019-04-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "virtualNetworkName": { diff --git a/tools/templateTests/TenantTemplate.2019-08-01.json b/tools/templateTests/TenantTemplate.2019-08-01.json index b8dd3a9d48..ae8ab5f72a 100644 --- a/tools/templateTests/TenantTemplate.2019-08-01.json +++ b/tools/templateTests/TenantTemplate.2019-08-01.json @@ -1,5 +1,9 @@ { "$schema": "https://schema.management.azure.com/schemas/2019-08-01/tenantDeploymentTemplate.json#", + "metadata": { + "comments": "This template was developed for schema validation purposes.", + "author": "Azure Deployments" + }, "contentVersion": "1.0.0.0", "parameters": { "siteName": { From dad3f5aa7be0974efe7d415456ab869f624c1b02 Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Tue, 2 Mar 2021 17:39:24 -0500 Subject: [PATCH 2/2] Add description --- schemas/2014-04-01-preview/deploymentTemplate.json | 1 + schemas/2015-01-01/deploymentTemplate.json | 1 + schemas/2018-05-01/subscriptionDeploymentTemplate.json | 1 + schemas/2019-03-01-hybrid/deploymentTemplate.json | 2 ++ schemas/2019-04-01/deploymentTemplate.json | 1 + schemas/2019-08-01/managementGroupDeploymentTemplate.json | 1 + schemas/2019-08-01/tenantDeploymentTemplate.json | 1 + 7 files changed, 8 insertions(+) diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json index 5e24dc8ae7..83f35de82e 100644 --- a/schemas/2014-04-01-preview/deploymentTemplate.json +++ b/schemas/2014-04-01-preview/deploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "contentVersion": { diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index 34fc6ddc49..4c916784a7 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "apiProfile": { diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json index fc5623d9e1..a75e2faf6d 100644 --- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json +++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "apiProfile": { diff --git a/schemas/2019-03-01-hybrid/deploymentTemplate.json b/schemas/2019-03-01-hybrid/deploymentTemplate.json index c64292ee19..db056c71c4 100644 --- a/schemas/2019-03-01-hybrid/deploymentTemplate.json +++ b/schemas/2019-03-01-hybrid/deploymentTemplate.json @@ -13,6 +13,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "contentVersion": { @@ -132,6 +133,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "contentVersion": { diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json index ee6b8f4d56..f9ac5e77ff 100644 --- a/schemas/2019-04-01/deploymentTemplate.json +++ b/schemas/2019-04-01/deploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "apiProfile": { diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json index 6060eacae4..c522b8b520 100644 --- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json +++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "apiProfile": { diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json index 984876302b..d60a6edfa3 100644 --- a/schemas/2019-08-01/tenantDeploymentTemplate.json +++ b/schemas/2019-08-01/tenantDeploymentTemplate.json @@ -11,6 +11,7 @@ }, "metadata": { "type": "object", + "description": "Additional unstructured metadata to include with the template deployment.", "additionalProperties": true }, "apiProfile": {