diff --git a/generator/autogenlist.ts b/generator/autogenlist.ts index dfbdb1387b..61e8aa2a93 100644 --- a/generator/autogenlist.ts +++ b/generator/autogenlist.ts @@ -14,7 +14,7 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'adhybridhealthservice/resource-manager', namespace: 'Microsoft.ADHybridHealthService', }, - { + { basePath: 'cdn/resource-manager', namespace: 'Microsoft.Cdn', }, @@ -50,20 +50,6 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'attestation/resource-manager', namespace: 'Microsoft.Attestation', }, - { - basePath: 'authorization/resource-manager', - namespace: 'Microsoft.Authorization', - resourceConfig: [ - { - type: 'roleAssignments', - scopes: ScopeType.Tenant | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.ManagementGroup, - }, - { - type: 'roleDefinitions', - scopes: ScopeType.Tenant | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.ManagementGroup, - }, - ] - }, { basePath: 'automation/resource-manager', namespace: 'Microsoft.Automation', @@ -76,11 +62,11 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'azurestack/resource-manager', namespace: 'Microsoft.AzureStack', }, - { + { basePath: 'batch/resource-manager', namespace: 'Microsoft.Batch', }, - { + { basePath: 'batchai/resource-manager', namespace: 'Microsoft.BatchAI', }, @@ -156,7 +142,7 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'databox/resource-manager', namespace: 'Microsoft.DataBox', }, - { + { basePath: 'operationalinsights/resource-manager', namespace: 'Microsoft.OperationalInsights', }, @@ -219,14 +205,14 @@ const autogenlist: AutogenlistConfig[] = [ namespace: 'Microsoft.DesktopVirtualization', }, { - basePath: 'digitaltwins/resource-manager', - namespace: 'Microsoft.DigitalTwins', - resourceConfig: [ - { - type: 'integrationResources', - scopes: ScopeType.Extension, - } - ] + basePath: 'digitaltwins/resource-manager', + namespace: 'Microsoft.DigitalTwins', + resourceConfig: [ + { + type: 'integrationResources', + scopes: ScopeType.Extension, + } + ] }, { basePath: 'deviceprovisioningservices/resource-manager', @@ -253,7 +239,7 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'resourcegraph/resource-manager', namespace: 'Microsoft.ResourceGraph', }, - { + { basePath: 'redis/resource-manager', namespace: 'Microsoft.Cache', }, @@ -266,14 +252,14 @@ const autogenlist: AutogenlistConfig[] = [ namespace: 'Microsoft.HDInsight', }, { - basePath: 'resourcehealth/resource-manager', - namespace: 'Microsoft.ResourceHealth', - }, +        basePath: 'resourcehealth/resource-manager', +        namespace: 'Microsoft.ResourceHealth', +    }, { basePath: 'EnterpriseKnowledgeGraph/resource-manager', namespace: 'Microsoft.EnterpriseKnowledgeGraph', }, - { + { basePath: 'domainservices/resource-manager', namespace: 'Microsoft.AAD', }, @@ -326,7 +312,7 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'labservices/resource-manager', namespace: 'Microsoft.LabServices', }, - { + { basePath: 'eventgrid/resource-manager', namespace: 'Microsoft.EventGrid', resourceConfig: [ @@ -408,8 +394,8 @@ const autogenlist: AutogenlistConfig[] = [ namespace: 'Microsoft.NetApp', }, { - basePath: 'notificationhubs/resource-manager', - namespace: 'Microsoft.NotificationHubs' + basePath: 'notificationhubs/resource-manager', + namespace: 'Microsoft.NotificationHubs' }, { basePath: 'policyinsights/resource-manager', @@ -517,10 +503,10 @@ const autogenlist: AutogenlistConfig[] = [ namespace: 'Microsoft.ImportExport' }, { - basePath: 'storSimple1200Series/resource-manager', - namespace: 'Microsoft.StorSimple', +        basePath: 'storSimple1200Series/resource-manager', +        namespace: 'Microsoft.StorSimple', suffix: '1200' - }, +    }, { basePath: 'storage/resource-manager', namespace: 'Microsoft.Storage', @@ -534,11 +520,11 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'visualstudio/resource-manager', namespace: 'Microsoft.VisualStudio', }, - { + { basePath: 'sql/resource-manager', namespace: 'Microsoft.Sql', }, - { + { basePath: 'scheduler/resource-manager', namespace: 'Microsoft.Scheduler', }, @@ -546,16 +532,16 @@ const autogenlist: AutogenlistConfig[] = [ basePath: 'search/resource-manager', namespace: 'Microsoft.Search', }, - { + { basePath: 'subscription/resource-manager', namespace: 'Microsoft.Subscription', }, - { + { basePath: 'storsimple8000series/resource-manager', namespace: 'Microsoft.StorSimple', suffix: '8000', }, - { + { basePath: 'support/resource-manager', namespace: 'Microsoft.Support', }, diff --git a/schemas/2015-07-01/Microsoft.Authorization.json b/schemas/2015-07-01/Microsoft.Authorization.json deleted file mode 100644 index e28d5b1d45..0000000000 --- a/schemas/2015-07-01/Microsoft.Authorization.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "unknown_resourceDefinitions": { - "roleAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2015-07-01" - ] - }, - "name": { - "type": "string", - "description": "The name of the role assignment to create. It can be any valid GUID." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleAssignments" - }, - "roleDefinitions": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2015-07-01" - ] - }, - "name": { - "type": "string", - "description": "The ID of the role definition." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleDefinitionProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleDefinitions" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleDefinitions" - } - }, - "definitions": { - "Permission": { - "type": "object", - "properties": { - "actions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Allowed actions." - }, - "notActions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Denied actions." - } - }, - "description": "Role definition permissions." - }, - "RoleAssignmentProperties": { - "type": "object", - "properties": { - "principalId": { - "type": "string", - "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group." - }, - "roleDefinitionId": { - "type": "string", - "description": "The role definition ID used in the role assignment." - } - }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "description": "Role assignment properties." - }, - "RoleDefinitionProperties": { - "type": "object", - "properties": { - "assignableScopes": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition assignable scopes." - }, - "description": { - "type": "string", - "description": "The role definition description." - }, - "permissions": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/definitions/Permission" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition permissions." - }, - "roleName": { - "type": "string", - "description": "The role name." - }, - "type": { - "type": "string", - "description": "The role type." - } - }, - "description": "Role definition properties." - } - } -} \ No newline at end of file diff --git a/schemas/2017-10-01-preview/Microsoft.Authorization.json b/schemas/2017-10-01-preview/Microsoft.Authorization.json deleted file mode 100644 index ce2435d512..0000000000 --- a/schemas/2017-10-01-preview/Microsoft.Authorization.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "unknown_resourceDefinitions": { - "roleAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2017-10-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the role assignment to create. It can be any valid GUID." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleAssignments" - } - }, - "definitions": { - "RoleAssignmentProperties": { - "type": "object", - "properties": { - "canDelegate": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The delegation flag used for creating a role assignment" - }, - "principalId": { - "type": "string", - "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group." - }, - "roleDefinitionId": { - "type": "string", - "description": "The role definition ID used in the role assignment." - } - }, - "description": "Role assignment properties." - } - } -} \ No newline at end of file diff --git a/schemas/2018-01-01-preview/Microsoft.Authorization.json b/schemas/2018-01-01-preview/Microsoft.Authorization.json deleted file mode 100644 index 3be68dccec..0000000000 --- a/schemas/2018-01-01-preview/Microsoft.Authorization.json +++ /dev/null @@ -1,226 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "unknown_resourceDefinitions": { - "roleAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2018-01-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the role assignment to create. It can be any valid GUID." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleAssignments" - }, - "roleDefinitions": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2018-01-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The ID of the role definition." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleDefinitionProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleDefinitions" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleDefinitions" - } - }, - "definitions": { - "Permission": { - "type": "object", - "properties": { - "actions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Allowed actions." - }, - "dataActions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Allowed Data actions." - }, - "notActions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Denied actions." - }, - "notDataActions": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Denied Data actions." - } - }, - "description": "Role definition permissions." - }, - "RoleAssignmentProperties": { - "type": "object", - "properties": { - "canDelegate": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The delegation flag used for creating a role assignment" - }, - "principalId": { - "type": "string", - "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group." - }, - "roleDefinitionId": { - "type": "string", - "description": "The role definition ID used in the role assignment." - } - }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "description": "Role assignment properties." - }, - "RoleDefinitionProperties": { - "type": "object", - "properties": { - "assignableScopes": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition assignable scopes." - }, - "description": { - "type": "string", - "description": "The role definition description." - }, - "permissions": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/definitions/Permission" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role definition permissions." - }, - "roleName": { - "type": "string", - "description": "The role name." - }, - "type": { - "type": "string", - "description": "The role type." - } - }, - "description": "Role definition properties." - } - } -} \ No newline at end of file diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json index 13260b37ed..ad6a84d102 100644 --- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json +++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json @@ -64,27 +64,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations" }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -103,9 +88,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -133,9 +115,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/subscription_resourceDefinitions/billingAccounts_lineOfCredit" }, diff --git a/schemas/2018-09-01-preview/Microsoft.Authorization.json b/schemas/2018-09-01-preview/Microsoft.Authorization.json deleted file mode 100644 index dfbededeab..0000000000 --- a/schemas/2018-09-01-preview/Microsoft.Authorization.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "unknown_resourceDefinitions": { - "roleAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2018-09-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the role assignment to create. It can be any valid GUID." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleAssignments" - } - }, - "definitions": { - "RoleAssignmentProperties": { - "type": "object", - "properties": { - "canDelegate": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The delegation flag used for creating a role assignment" - }, - "principalId": { - "type": "string", - "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group." - }, - "principalType": { - "oneOf": [ - { - "type": "string", - "enum": [ - "User", - "Group", - "ServicePrincipal", - "Unknown", - "DirectoryRoleTemplate", - "ForeignGroup", - "Application", - "MSI", - "DirectoryObjectOrGroup", - "Everyone" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The principal type of the assigned principal ID." - }, - "roleDefinitionId": { - "type": "string", - "description": "The role definition ID used in the role assignment." - } - }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "description": "Role assignment properties." - } - } -} \ No newline at end of file diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json index 15b8abee93..3e7359c0a8 100644 --- a/schemas/2019-04-01/deploymentTemplate.json +++ b/schemas/2019-04-01/deploymentTemplate.json @@ -1344,6 +1344,11 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" }, { "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.BareMetal.json#/resourceDefinitions/crayServers" }, + { "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2018-02-01/Microsoft.Web.json#/resourceDefinitions/certificates" }, { "$ref": "https://schema.management.azure.com/schemas/2018-02-01/Microsoft.Web.json#/resourceDefinitions/hostingEnvironments" }, { "$ref": "https://schema.management.azure.com/schemas/2018-02-01/Microsoft.Web.json#/resourceDefinitions/hostingEnvironments_multiRolePools" }, @@ -1475,7 +1480,11 @@ }, { "oneOf": [ - { "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Resources.json#/resourceDefinitions/deployments" } + { "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Resources.json#/resourceDefinitions/deployments" }, + { "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/resourceDefinitions/locks" }, + { "$ref": "https://schema.management.azure.com/schemas/2014-10-01-preview/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, + { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" } ] } ] diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json index 6402fec9e2..a064324e7e 100644 --- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json +++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json @@ -52,27 +52,12 @@ }, { "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -91,9 +76,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -121,9 +103,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-11-11-preview/Microsoft.Blueprint.json#/managementGroup_resourceDefinitions/blueprints" }, diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json index 72b6cd8abc..aad797418a 100644 --- a/schemas/2019-08-01/tenantDeploymentTemplate.json +++ b/schemas/2019-08-01/tenantDeploymentTemplate.json @@ -57,27 +57,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings" }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments" }, { "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, { "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -96,9 +81,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments" }, @@ -126,9 +108,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions" }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles" }, diff --git a/schemas/2020-04-01-preview/Microsoft.Authorization.json b/schemas/2020-04-01-preview/Microsoft.Authorization.json deleted file mode 100644 index 586d33eba3..0000000000 --- a/schemas/2020-04-01-preview/Microsoft.Authorization.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Authorization", - "description": "Microsoft Authorization Resource Types", - "resourceDefinitions": {}, - "unknown_resourceDefinitions": { - "roleAssignments": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2020-04-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the role assignment to create. It can be any valid GUID." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/RoleAssignmentProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Role assignment properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Authorization/roleAssignments" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Authorization/roleAssignments" - } - }, - "definitions": { - "RoleAssignmentProperties": { - "type": "object", - "properties": { - "canDelegate": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The delegation flag used for creating a role assignment" - }, - "condition": { - "type": "string", - "description": "The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase 'foo_storage_container'" - }, - "conditionVersion": { - "type": "string", - "description": "Version of the condition. Currently accepted value is '2.0'" - }, - "description": { - "type": "string", - "description": "Description of role assignment" - }, - "principalId": { - "type": "string", - "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group." - }, - "principalType": { - "oneOf": [ - { - "type": "string", - "enum": [ - "User", - "Group", - "ServicePrincipal", - "Unknown", - "DirectoryRoleTemplate", - "ForeignGroup", - "Application", - "MSI", - "DirectoryObjectOrGroup", - "Everyone" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The principal type of the assigned principal ID." - }, - "roleDefinitionId": { - "type": "string", - "description": "The role definition ID used in the role assignment." - } - }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "description": "Role assignment properties." - } - } -} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 063f9bc9be..ba1eed3d16 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -1120,27 +1120,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Attestation.json#/resourceDefinitions/attestationProviders" }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/roleAssignments" - }, { "$ref": "https://schema.management.azure.com/schemas/2015-10-31/Microsoft.Automation.json#/resourceDefinitions/automationAccounts" },