CodeGen from PR 13936 in Azure/azure-rest-api-specs

SDKAuto · SDKAuto · commit d9dbb228d9d4 · 2021-04-23T03:22:49.000Z
Merge 8b81f1ed16a74760f330a9719ce489ecc0c84ed6 into 954a3285e388dea940dc9628cf7dd0434e92e138
diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -375,6 +375,15 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/subscription_resourceDefinitions/deployments"
+              },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/subscription_resourceDefinitions/resourceGroups"
+              },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2015-06-01-preview/Microsoft.Security.json#/subscription_resourceDefinitions/locations_applicationWhitelistings"
               },
diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
@@ -174,6 +174,12 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/managementGroup_resourceDefinitions/deployments"
+              },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2017-08-01-preview/Microsoft.Security.json#/unknown_resourceDefinitions/informationProtectionPolicies"
               }
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -266,6 +266,9 @@
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Resources.json#/tenant_resourceDefinitions/deployments"
                   },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/tenant_resourceDefinitions/deployments"
+                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/subscriptionDefinitions"
                   },
diff --git a/schemas/2020-06-01/Microsoft.Resources.json b/schemas/2020-06-01/Microsoft.Resources.json
@@ -18,17 +18,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -98,17 +90,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -229,17 +213,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -304,17 +280,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -379,17 +347,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
diff --git a/schemas/2020-08-01/Microsoft.Resources.json b/schemas/2020-08-01/Microsoft.Resources.json
@@ -18,17 +18,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -98,17 +90,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -229,17 +213,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -304,17 +280,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -379,17 +347,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
diff --git a/schemas/2020-10-01/Microsoft.Resources.json b/schemas/2020-10-01/Microsoft.Resources.json
@@ -18,17 +18,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -166,17 +158,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -297,17 +281,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -372,17 +348,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
@@ -447,17 +415,9 @@
           "description": "The location to store the deployment data."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
           "description": "The name of the deployment."
         },
         "properties": {
diff --git a/schemas/2021-01-01/Microsoft.Resources.json b/schemas/2021-01-01/Microsoft.Resources.json
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,12 @@`
`174`	`174`	`{`
`175`	`175`	`"$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"`
`176`	`176`	`},`
	`177`	`+ {`
	`178`	`+ "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/managementGroup_resourceDefinitions/deployments"`
	`179`	`+ },`
	`180`	`+ {`
	`181`	`+ "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/unknown_resourceDefinitions/tags"`
	`182`	`+ },`
`177`	`183`	`{`
`178`	`184`	`"$ref": "https://schema.management.azure.com/schemas/2017-08-01-preview/Microsoft.Security.json#/unknown_resourceDefinitions/informationProtectionPolicies"`
`179`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,9 @@`
`266`	`266`	`{`
`267`	`267`	`"$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Resources.json#/tenant_resourceDefinitions/deployments"`
`268`	`268`	`},`
	`269`	`+ {`
	`270`	`+ "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.Resources.json#/tenant_resourceDefinitions/deployments"`
	`271`	`+ },`
`269`	`272`	`{`
`270`	`273`	`"$ref": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/subscriptionDefinitions"`
`271`	`274`	`},`