From eb34d0f3e743ecefc6a8802d02d224e1c57baca1 Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Fri, 11 Jun 2021 02:58:19 +0000 Subject: [PATCH] Add suffix to Microsoft.Authorization config --- generator/autogenlist.ts | 1 + generator/specs.ts | 26 ++-- .../deploymentTemplate.json | 31 ++--- ...=> Microsoft.Authorization.Resources.json} | 2 +- schemas/2015-01-01/deploymentTemplate.json | 31 ++--- ...=> Microsoft.Authorization.Resources.json} | 2 +- .../2015-11-01/Microsoft.Authorization.json | 128 ------------------ ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- .../subscriptionDeploymentTemplate.json | 125 +++++++++-------- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- .../managementGroupDeploymentTemplate.json | 83 ++++++------ ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- ...=> Microsoft.Authorization.Resources.json} | 2 +- schemas/common/autogeneratedResources.json | 31 ++--- .../Microsoft.Authorization.tests.json | 2 +- tests/2018-03-01/policyAssignment.tests.json | 4 +- .../2018-03-01/policySetDefinition.tests.json | 4 +- tests/2018-05-01/policyAssignment.tests.json | 4 +- .../2018-05-01/policySetDefinition.tests.json | 4 +- ...Authorization.PolicyAssignments.tests.json | 4 +- ...Authorization.PolicyDefinitions.tests.json | 4 +- ...horization.PolicySetDefinitions.tests.json | 4 +- ...Authorization.PolicyAssignments.tests.json | 4 +- ...Authorization.PolicyDefinitions.tests.json | 4 +- ...horization.PolicySetDefinitions.tests.json | 4 +- ...Authorization.PolicyAssignments.tests.json | 4 +- ...Authorization.PolicyDefinitions.tests.json | 4 +- ...horization.PolicySetDefinitions.tests.json | 6 +- 36 files changed, 207 insertions(+), 333 deletions(-) rename schemas/2015-01-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (98%) rename schemas/2015-10-01-preview/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (98%) delete mode 100644 schemas/2015-11-01/Microsoft.Authorization.json rename schemas/2016-04-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (98%) rename schemas/2016-09-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2016-12-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2017-06-01-preview/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2018-03-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2018-05-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2019-01-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2019-06-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2019-09-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2020-03-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) rename schemas/2020-07-01-preview/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (98%) rename schemas/2020-09-01/{Microsoft.Authorization.json => Microsoft.Authorization.Resources.json} (99%) diff --git a/generator/autogenlist.ts b/generator/autogenlist.ts index f12468438..f63c84400 100644 --- a/generator/autogenlist.ts +++ b/generator/autogenlist.ts @@ -492,6 +492,7 @@ const autoGenList: AutoGenConfig[] = [ scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension, }, ], + suffix: 'Resources', postProcessor: policyProcessor }, { diff --git a/generator/specs.ts b/generator/specs.ts index 30d13cd69..0a842c211 100644 --- a/generator/specs.ts +++ b/generator/specs.ts @@ -74,17 +74,21 @@ export async function prepareReadme(readme: string, autoGenConfig?: AutoGenConfi const content = fs.readFileSync(readme).toString(); const markdownEx = cm.parse(content); const fileSet = new Set(); - for (const codeBlock of cm.iterate(markdownEx.markDown)) { - if (codeBlock.type === 'code_block' && codeBlock?.info?.startsWith('yaml') && codeBlock.literal !== null) { - const DOC = (yaml.load(codeBlock.literal) as CodeBlock); - if (DOC) { - const inputFile = DOC['input-file']; - if (typeof inputFile === 'string') { - fileSet.add(inputFile); - } else if (inputFile instanceof Array) { - for (const i of inputFile) { - fileSet.add(i); - } + for (const node of cm.iterate(markdownEx.markDown)) { + // We're only interested in yaml code blocks + if (node.type !== 'code_block' || !node.info || !node.literal || + !node.info.trim().startsWith('yaml')) { + continue; + } + + const DOC = (yaml.load(node.literal) as CodeBlock); + if (DOC) { + const inputFile = DOC['input-file']; + if (typeof inputFile === 'string') { + fileSet.add(inputFile); + } else if (inputFile instanceof Array) { + for (const i of inputFile) { + fileSet.add(i); } } } diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json index c92db6866..61eff10e7 100644 --- a/schemas/2014-04-01-preview/deploymentTemplate.json +++ b/schemas/2014-04-01-preview/deploymentTemplate.json @@ -6259,49 +6259,46 @@ "$ref": "https://schema.management.azure.com/schemas/2019-11-04-preview/Microsoft.Quantum.json#/resourceDefinitions/workspaces" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyExemptions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { "$ref": "#/definitions/resourceGeneric" diff --git a/schemas/2015-01-01/Microsoft.Authorization.json b/schemas/2015-01-01/Microsoft.Authorization.Resources.json similarity index 98% rename from schemas/2015-01-01/Microsoft.Authorization.json rename to schemas/2015-01-01/Microsoft.Authorization.Resources.json index d3c8942b2..19a9a59a4 100644 --- a/schemas/2015-01-01/Microsoft.Authorization.json +++ b/schemas/2015-01-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index 836041381..2f92881b4 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -6678,49 +6678,46 @@ "$ref": "https://schema.management.azure.com/schemas/2019-11-04-preview/Microsoft.Quantum.json#/resourceDefinitions/workspaces" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyExemptions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" } ] } diff --git a/schemas/2015-10-01-preview/Microsoft.Authorization.json b/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json similarity index 98% rename from schemas/2015-10-01-preview/Microsoft.Authorization.json rename to schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json index f0e1e0b8d..bcb1f8a24 100644 --- a/schemas/2015-10-01-preview/Microsoft.Authorization.json +++ b/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2015-11-01/Microsoft.Authorization.json b/schemas/2015-11-01/Microsoft.Authorization.json deleted file mode 100644 index 5322fc340..000000000 --- a/schemas/2015-11-01/Microsoft.Authorization.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "subscription_resourceDefinitions": { - "policydefinitions": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2015-11-01" - ] - }, - "name": { - "type": "string", - "description": "The policy definition name." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/PolicyDefinitionProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Policy definition properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/policydefinitions" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/policydefinitions" - } - }, - "unknown_resourceDefinitions": { - "policyAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2015-11-01" - ] - }, - "name": { - "type": "string", - "description": "Policy assignment name." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/PolicyAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Policy Assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/policyAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/policyAssignments" - } - }, - "definitions": { - "PolicyAssignmentProperties": { - "type": "object", - "properties": { - "displayName": { - "type": "string", - "description": "Gets or sets the policy assignment display name." - }, - "policyDefinitionId": { - "type": "string", - "description": "Gets or sets the policy definition Id." - }, - "scope": { - "type": "string", - "description": "Gets or sets the policy assignment scope." - } - }, - "description": "Policy Assignment properties." - }, - "PolicyDefinitionProperties": { - "type": "object", - "properties": { - "description": { - "type": "string", - "description": "Gets or sets the policy definition description." - }, - "displayName": { - "type": "string", - "description": "Gets or sets the policy definition display name." - }, - "policyRule": { - "type": "object", - "properties": {}, - "description": "The policy rule json." - } - }, - "description": "Policy definition properties." - } - } -} \ No newline at end of file diff --git a/schemas/2016-04-01/Microsoft.Authorization.json b/schemas/2016-04-01/Microsoft.Authorization.Resources.json similarity index 98% rename from schemas/2016-04-01/Microsoft.Authorization.json rename to schemas/2016-04-01/Microsoft.Authorization.Resources.json index 346ff995c..68d021358 100644 --- a/schemas/2016-04-01/Microsoft.Authorization.json +++ b/schemas/2016-04-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2016-09-01/Microsoft.Authorization.json b/schemas/2016-09-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2016-09-01/Microsoft.Authorization.json rename to schemas/2016-09-01/Microsoft.Authorization.Resources.json index 5d6ccf552..d6ee5204e 100644 --- a/schemas/2016-09-01/Microsoft.Authorization.json +++ b/schemas/2016-09-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2016-12-01/Microsoft.Authorization.json b/schemas/2016-12-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2016-12-01/Microsoft.Authorization.json rename to schemas/2016-12-01/Microsoft.Authorization.Resources.json index 132f17147..5c7c1f773 100644 --- a/schemas/2016-12-01/Microsoft.Authorization.json +++ b/schemas/2016-12-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2017-06-01-preview/Microsoft.Authorization.json b/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2017-06-01-preview/Microsoft.Authorization.json rename to schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json index 71586677d..0ff0caf38 100644 --- a/schemas/2017-06-01-preview/Microsoft.Authorization.json +++ b/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2018-03-01/Microsoft.Authorization.json b/schemas/2018-03-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2018-03-01/Microsoft.Authorization.json rename to schemas/2018-03-01/Microsoft.Authorization.Resources.json index c3ba7789e..bf992041c 100644 --- a/schemas/2018-03-01/Microsoft.Authorization.json +++ b/schemas/2018-03-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2018-05-01/Microsoft.Authorization.json b/schemas/2018-05-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2018-05-01/Microsoft.Authorization.json rename to schemas/2018-05-01/Microsoft.Authorization.Resources.json index dd4347bc2..138d5e0e9 100644 --- a/schemas/2018-05-01/Microsoft.Authorization.json +++ b/schemas/2018-05-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json index 664aa1263..09e2c4947 100644 --- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json +++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json @@ -69,42 +69,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations" }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/locks" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/subscription_resourceDefinitions/policydefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policydefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policydefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/locks" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, @@ -112,70 +76,115 @@ "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policydefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policydefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyExemptions" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/subscription_resourceDefinitions/billingAccounts_lineOfCredit" diff --git a/schemas/2019-01-01/Microsoft.Authorization.json b/schemas/2019-01-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2019-01-01/Microsoft.Authorization.json rename to schemas/2019-01-01/Microsoft.Authorization.Resources.json index ec2829c36..ea041eea8 100644 --- a/schemas/2019-01-01/Microsoft.Authorization.json +++ b/schemas/2019-01-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2019-06-01/Microsoft.Authorization.json b/schemas/2019-06-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2019-06-01/Microsoft.Authorization.json rename to schemas/2019-06-01/Microsoft.Authorization.Resources.json index 6466c8cff..2ec8c8031 100644 --- a/schemas/2019-06-01/Microsoft.Authorization.json +++ b/schemas/2019-06-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json index 617b292fb..74cfd06e2 100644 --- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json +++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json @@ -57,27 +57,6 @@ }, { "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, @@ -85,70 +64,88 @@ "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyExemptions" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policySetDefinitions" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policyDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/policySetDefinitions" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2017-11-11-preview/Microsoft.Blueprint.json#/managementGroup_resourceDefinitions/blueprints" diff --git a/schemas/2019-09-01/Microsoft.Authorization.json b/schemas/2019-09-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2019-09-01/Microsoft.Authorization.json rename to schemas/2019-09-01/Microsoft.Authorization.Resources.json index 69d77a6a1..fbb2eb995 100644 --- a/schemas/2019-09-01/Microsoft.Authorization.json +++ b/schemas/2019-09-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2020-03-01/Microsoft.Authorization.json b/schemas/2020-03-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2020-03-01/Microsoft.Authorization.json rename to schemas/2020-03-01/Microsoft.Authorization.Resources.json index c50d1de4e..66fe3450c 100644 --- a/schemas/2020-03-01/Microsoft.Authorization.json +++ b/schemas/2020-03-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2020-07-01-preview/Microsoft.Authorization.json b/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json similarity index 98% rename from schemas/2020-07-01-preview/Microsoft.Authorization.json rename to schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json index aacbebb9f..c91ca7a92 100644 --- a/schemas/2020-07-01-preview/Microsoft.Authorization.json +++ b/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/2020-09-01/Microsoft.Authorization.json b/schemas/2020-09-01/Microsoft.Authorization.Resources.json similarity index 99% rename from schemas/2020-09-01/Microsoft.Authorization.json rename to schemas/2020-09-01/Microsoft.Authorization.Resources.json index 6ecd0d8f6..714f0d94d 100644 --- a/schemas/2020-09-01/Microsoft.Authorization.json +++ b/schemas/2020-09-01/Microsoft.Authorization.Resources.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#", + "id": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.Authorization", "description": "Microsoft Authorization Resource Types", diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 4c3deccbd..4c30d4ab4 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -1499,49 +1499,46 @@ "$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.Attestation.json#/resourceDefinitions/attestationProviders_privateEndpointConnections" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyassignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-04-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments" + "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#/resourceDefinitions/locks" + "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyExemptions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments" + "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2020-06-30-preview/Microsoft.Automanage.json#/resourceDefinitions/accounts" diff --git a/tests/2016-09-01/Microsoft.Authorization.tests.json b/tests/2016-09-01/Microsoft.Authorization.tests.json index e4d63e43e..81ecbf3b3 100644 --- a/tests/2016-09-01/Microsoft.Authorization.tests.json +++ b/tests/2016-09-01/Microsoft.Authorization.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "locks - basic", - "definition": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.json#/resourceDefinitions/locks", + "definition": "https://schema.management.azure.com/schemas/2016-09-01/Microsoft.Authorization.Resources.json#/resourceDefinitions/locks", "json": { "apiVersion": "2016-09-01", "name": "validLock", diff --git a/tests/2018-03-01/policyAssignment.tests.json b/tests/2018-03-01/policyAssignment.tests.json index 94a526a33..68db925fe 100644 --- a/tests/2018-03-01/policyAssignment.tests.json +++ b/tests/2018-03-01/policyAssignment.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyAssignment valid test", - "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2018-03-01", "sku": { @@ -36,7 +36,7 @@ }, { "name": "PolicyAssignment invalid test", - "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2018-03-01", "sku": { diff --git a/tests/2018-03-01/policySetDefinition.tests.json b/tests/2018-03-01/policySetDefinition.tests.json index d6ed66925..c9fdd12c1 100644 --- a/tests/2018-03-01/policySetDefinition.tests.json +++ b/tests/2018-03-01/policySetDefinition.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicySetDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2018-03-01", "properties": { @@ -52,7 +52,7 @@ }, { "name": "PolicySetDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2018-03-01", "properties": { diff --git a/tests/2018-05-01/policyAssignment.tests.json b/tests/2018-05-01/policyAssignment.tests.json index 006f960ee..772414c78 100644 --- a/tests/2018-05-01/policyAssignment.tests.json +++ b/tests/2018-05-01/policyAssignment.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyAssignment valid test", - "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2018-05-01", "sku": { @@ -41,7 +41,7 @@ }, { "name": "PolicyAssignment invalid test", - "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2018-05-01", "sku": { diff --git a/tests/2018-05-01/policySetDefinition.tests.json b/tests/2018-05-01/policySetDefinition.tests.json index eab52dbef..05368ffa4 100644 --- a/tests/2018-05-01/policySetDefinition.tests.json +++ b/tests/2018-05-01/policySetDefinition.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicySetDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2018-05-01", "properties": { @@ -52,7 +52,7 @@ }, { "name": "PolicySetDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2018-05-01", "properties": { diff --git a/tests/2019-01-01/Microsoft.Authorization.PolicyAssignments.tests.json b/tests/2019-01-01/Microsoft.Authorization.PolicyAssignments.tests.json index 11e98fa27..397d4d6f8 100644 --- a/tests/2019-01-01/Microsoft.Authorization.PolicyAssignments.tests.json +++ b/tests/2019-01-01/Microsoft.Authorization.PolicyAssignments.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyAssignment valid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-01-01", "sku": { @@ -41,7 +41,7 @@ }, { "name": "PolicyAssignment invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-01-01", "sku": { diff --git a/tests/2019-01-01/Microsoft.Authorization.PolicyDefinitions.tests.json b/tests/2019-01-01/Microsoft.Authorization.PolicyDefinitions.tests.json index 07fd21bb2..884796e23 100644 --- a/tests/2019-01-01/Microsoft.Authorization.PolicyDefinitions.tests.json +++ b/tests/2019-01-01/Microsoft.Authorization.PolicyDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-01-01", "properties": { @@ -79,7 +79,7 @@ }, { "name": "PolicyDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-01-01", "properties": { diff --git a/tests/2019-01-01/Microsoft.Authorization.PolicySetDefinitions.tests.json b/tests/2019-01-01/Microsoft.Authorization.PolicySetDefinitions.tests.json index 7805f8bb9..42021052e 100644 --- a/tests/2019-01-01/Microsoft.Authorization.PolicySetDefinitions.tests.json +++ b/tests/2019-01-01/Microsoft.Authorization.PolicySetDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicySetDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-01-01", "properties": { @@ -52,7 +52,7 @@ }, { "name": "PolicySetDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-01-01", "properties": { diff --git a/tests/2019-06-01/Microsoft.Authorization.PolicyAssignments.tests.json b/tests/2019-06-01/Microsoft.Authorization.PolicyAssignments.tests.json index 00f19bb24..ac041dac1 100644 --- a/tests/2019-06-01/Microsoft.Authorization.PolicyAssignments.tests.json +++ b/tests/2019-06-01/Microsoft.Authorization.PolicyAssignments.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyAssignment valid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-06-01", "sku": { @@ -41,7 +41,7 @@ }, { "name": "PolicyAssignment invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-06-01", "sku": { diff --git a/tests/2019-06-01/Microsoft.Authorization.PolicyDefinitions.tests.json b/tests/2019-06-01/Microsoft.Authorization.PolicyDefinitions.tests.json index a6ce61891..ae9198491 100644 --- a/tests/2019-06-01/Microsoft.Authorization.PolicyDefinitions.tests.json +++ b/tests/2019-06-01/Microsoft.Authorization.PolicyDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-06-01", "properties": { @@ -79,7 +79,7 @@ }, { "name": "PolicyDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-06-01", "properties": { diff --git a/tests/2019-06-01/Microsoft.Authorization.PolicySetDefinitions.tests.json b/tests/2019-06-01/Microsoft.Authorization.PolicySetDefinitions.tests.json index ee0681882..1363400de 100644 --- a/tests/2019-06-01/Microsoft.Authorization.PolicySetDefinitions.tests.json +++ b/tests/2019-06-01/Microsoft.Authorization.PolicySetDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicySetDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-06-01", "properties": { @@ -52,7 +52,7 @@ }, { "name": "PolicySetDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-06-01", "properties": { diff --git a/tests/2019-09-01/Microsoft.Authorization.PolicyAssignments.tests.json b/tests/2019-09-01/Microsoft.Authorization.PolicyAssignments.tests.json index cc629ebe2..0304dbed5 100644 --- a/tests/2019-09-01/Microsoft.Authorization.PolicyAssignments.tests.json +++ b/tests/2019-09-01/Microsoft.Authorization.PolicyAssignments.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyAssignment valid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-09-01", "sku": { @@ -41,7 +41,7 @@ }, { "name": "PolicyAssignment invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#unknown_resourceDefinitions/policyAssignments", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#unknown_resourceDefinitions/policyAssignments", "json": { "apiVersion": "2019-09-01", "sku": { diff --git a/tests/2019-09-01/Microsoft.Authorization.PolicyDefinitions.tests.json b/tests/2019-09-01/Microsoft.Authorization.PolicyDefinitions.tests.json index ed1a8e51e..291cfa8a4 100644 --- a/tests/2019-09-01/Microsoft.Authorization.PolicyDefinitions.tests.json +++ b/tests/2019-09-01/Microsoft.Authorization.PolicyDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicyDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-09-01", "properties": { @@ -79,7 +79,7 @@ }, { "name": "PolicyDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policyDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policyDefinitions", "json": { "apiVersion": "2019-09-01", "properties": { diff --git a/tests/2019-09-01/Microsoft.Authorization.PolicySetDefinitions.tests.json b/tests/2019-09-01/Microsoft.Authorization.PolicySetDefinitions.tests.json index f6a7d613f..11d3a76d8 100644 --- a/tests/2019-09-01/Microsoft.Authorization.PolicySetDefinitions.tests.json +++ b/tests/2019-09-01/Microsoft.Authorization.PolicySetDefinitions.tests.json @@ -2,7 +2,7 @@ "tests": [ { "name": "PolicySetDefinition valid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-09-01", "properties": { @@ -66,7 +66,7 @@ }, { "name": "PolicySetDefinition invalid test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-09-01", "properties": { @@ -115,7 +115,7 @@ }, { "name": "PolicySetDefinition invalid groups test", - "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#subscription_resourceDefinitions/policySetDefinitions", + "definition": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.Resources.json#subscription_resourceDefinitions/policySetDefinitions", "json": { "apiVersion": "2019-09-01", "properties": {