From 1aab119280a8d2f4bc28570b02a0d90821779a0b Mon Sep 17 00:00:00 2001 From: Chris Eggert Date: Tue, 1 Oct 2019 15:10:57 -0700 Subject: [PATCH] Api-version 2019-09-01 of policy entities --- .../createOrUpdatePolicyDefinition.json | 2 +- ...datePolicyDefinitionAtManagementGroup.json | 2 +- .../createOrUpdatePolicySetDefinition.json | 8 +- ...ePolicySetDefinitionAtManagementGroup.json | 8 +- ...OrUpdatePolicySetDefinitionWithGroups.json | 168 ++++++++++++++++++ ...DefinitionWithGroupsAtManagementGroup.json | 168 ++++++++++++++++++ .../examples/createPolicyAssignment.json | 2 +- .../examples/createPolicyAssignmentById.json | 2 +- .../createPolicyAssignmentWithIdentity.json | 2 +- ...reatePolicyAssignmentWithIdentityById.json | 2 +- ...atePolicyAssignmentWithoutEnforcement.json | 2 +- .../examples/deletePolicyAssignment.json | 2 +- .../examples/deletePolicyAssignmentById.json | 2 +- .../examples/deletePolicyDefinition.json | 2 +- ...letePolicyDefinitionAtManagementGroup.json | 2 +- .../examples/deletePolicySetDefinition.json | 2 +- ...ePolicySetDefinitionAtManagementGroup.json | 2 +- .../getBuiltInPolicySetDefinition.json | 41 ++--- .../examples/getBuiltinPolicyDefinition.json | 2 +- .../examples/getPolicyAssignment.json | 2 +- .../examples/getPolicyAssignmentById.json | 2 +- .../getPolicyAssignmentWithIdentity.json | 2 +- .../getPolicyAssignmentWithIdentityById.json | 2 +- .../examples/getPolicyDefinition.json | 2 +- .../getPolicyDefinitionAtManagementGroup.json | 2 +- .../examples/getPolicySetDefinition.json | 20 ++- ...tPolicySetDefinitionAtManagementGroup.json | 4 +- .../listBuiltInPolicyDefinitions.json | 4 +- .../listBuiltInPolicySetDefinitions.json | 41 ++--- .../examples/listPolicyAssignments.json | 2 +- .../listPolicyAssignmentsForResource.json | 2 +- ...listPolicyAssignmentsForResourceGroup.json | 2 +- .../examples/listPolicyDefinitions.json | 2 +- ...istPolicyDefinitionsByManagementGroup.json | 2 +- .../examples/listPolicySetDefinitions.json | 43 ++--- ...PolicySetDefinitionsByManagementGroup.json | 43 ++--- .../stable/2019-09-01/policyAssignments.json | 47 ++--- .../stable/2019-09-01/policyDefinitions.json | 76 +++++++- .../2019-09-01/policySetDefinitions.json | 102 +++++++---- .../resources/resource-manager/readme.go.md | 11 ++ .../resources/resource-manager/readme.java.md | 19 ++ .../resources/resource-manager/readme.md | 20 ++- .../resource-manager/readme.python.md | 12 ++ 43 files changed, 710 insertions(+), 175 deletions(-) create mode 100644 specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroups.json create mode 100644 specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroupsAtManagementGroup.json diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinition.json index 250db181f7d7..b39478c814d1 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "mode": "All", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinitionAtManagementGroup.json index ddf1705fc49c..5a6564a327c4 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicyDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "mode": "All", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinition.json index e009dfea5a0f..d490116afd2d 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "displayName": "Cost Management", @@ -13,6 +13,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -24,6 +25,7 @@ }, { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" @@ -53,6 +55,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -64,6 +67,7 @@ }, { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" @@ -92,6 +96,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -103,6 +108,7 @@ }, { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionAtManagementGroup.json index e97aa511fc51..4d9879f99cf7 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "displayName": "Cost Management", @@ -13,6 +13,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -24,6 +25,7 @@ }, { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" @@ -53,6 +55,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -64,6 +67,7 @@ }, { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" @@ -92,6 +96,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -103,6 +108,7 @@ }, { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroups.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroups.json new file mode 100644 index 000000000000..4657177a2e1d --- /dev/null +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroups.json @@ -0,0 +1,168 @@ +{ + "parameters": { + "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", + "policySetDefinitionName": "CostManagement", + "api-version": "2019-09-01", + "parameters": { + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + }, + "responses": { + "201": { + "headers": {}, + "body": { + "id": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policySetDefinitions/CostManagement", + "type": "Microsoft.Authorization/policySetDefinitions", + "name": "CostManagement", + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + }, + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policySetDefinitions/CostManagement", + "type": "Microsoft.Authorization/policySetDefinitions", + "name": "CostManagement", + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + } + } +} diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroupsAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroupsAtManagementGroup.json new file mode 100644 index 000000000000..4492245e7a80 --- /dev/null +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createOrUpdatePolicySetDefinitionWithGroupsAtManagementGroup.json @@ -0,0 +1,168 @@ +{ + "parameters": { + "managementGroupId": "MyManagementGroup", + "policySetDefinitionName": "CostManagement", + "api-version": "2019-09-01", + "parameters": { + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + }, + "responses": { + "201": { + "headers": {}, + "body": { + "id": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policySetDefinitions/CostManagement", + "type": "Microsoft.Authorization/policySetDefinitions", + "name": "CostManagement", + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + }, + "200": { + "headers": {}, + "body": { + "id": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policySetDefinitions/CostManagement", + "type": "Microsoft.Authorization/policySetDefinitions", + "name": "CostManagement", + "properties": { + "displayName": "Cost Management", + "description": "Policies to enforce low cost storage SKUs", + "metadata": { + "category": "Cost Management" + }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], + "policyDefinitions": [ + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", + "parameters": { + "listOfAllowedSKUs": { + "value": [ + "Standard_GRS", + "Standard_LRS" + ] + } + } + }, + { + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", + "parameters": { + "prefix": { + "value": "DeptA" + }, + "suffix": { + "value": "-LC" + } + } + } + ] + } + } + } + } +} diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignment.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignment.json index e7b41234c5f3..3a76a643bf96 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignment.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignment.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "displayName": "Enforce resource naming rules", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentById.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentById.json index cd36574044a8..0262e2b7815f 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentById.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentById.json @@ -1,7 +1,7 @@ { "parameters": { "policyAssignmentId": "providers/Microsoft.Management/managementGroups/MyManagementGroup/providers/Microsoft.Authorization/policyAssignments/LowCostStorage", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "displayName": "Enforce storage account SKU", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentity.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentity.json index afaf6b0049cb..594301fc63be 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentity.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentity.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "location": "eastus", "identity": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentityById.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentityById.json index 2fcfd2d892a0..ba44f34cf343 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentityById.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithIdentityById.json @@ -1,7 +1,7 @@ { "parameters": { "policyAssignmentId": "providers/Microsoft.Management/managementGroups/MyManagementGroup/providers/Microsoft.Authorization/policyAssignments/LowCostStorage", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "identity": { "type": "SystemAssigned" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithoutEnforcement.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithoutEnforcement.json index 584432cf914d..35f5d62a8295 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithoutEnforcement.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/createPolicyAssignmentWithoutEnforcement.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "parameters": { "properties": { "displayName": "Enforce resource naming rules", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignment.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignment.json index 632c6f8cffdb..f5061b6e516b 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignment.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignment.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignmentById.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignmentById.json index c43391ee8cf0..67e670368914 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignmentById.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyAssignmentById.json @@ -1,7 +1,7 @@ { "parameters": { "policyAssignmentId": "providers/Microsoft.Management/managementGroups/MyManagementGroup/providers/Microsoft.Authorization/policyAssignments/LowCostStorage", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinition.json index e68165f5af43..cfaa53ff8645 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinitionAtManagementGroup.json index 93ed2d064ffb..84bc6e5f4fa0 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicyDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinition.json index b335b056e3d4..00ae7125cf2c 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinitionAtManagementGroup.json index 75ebab143036..69088f873a4f 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/deletePolicySetDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltInPolicySetDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltInPolicySetDefinition.json index fe1345f26960..28354bd894ca 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltInPolicySetDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltInPolicySetDefinition.json @@ -1,7 +1,7 @@ { "parameters": { "policySetDefinitionName": "1f3afdf9-d0c9-4c3d-847f-89da613e70a8", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -17,43 +17,44 @@ "parameters": {}, "policyDefinitions": [ { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16", + "policyDefinitionReferenceId": "RefId1" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d", + "policyDefinitionReferenceId": "RefId2" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60", + "policyDefinitionReferenceId": "RefId3" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759", + "policyDefinitionReferenceId": "RefId4" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c", + "policyDefinitionReferenceId": "RefId5" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc", + "policyDefinitionReferenceId": "RefId6" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed", + "policyDefinitionReferenceId": "RefId7" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15", + "policyDefinitionReferenceId": "RefId8" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9", + "policyDefinitionReferenceId": "RefId9" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/760a85ff-6162-42b3-8d70-698e268f648c" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/201ea587-7c90-41c3-910f-c280ae01cfd6" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/9daedab3-fb2d-461e-b861-71790eead4f6" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d", + "policyDefinitionReferenceId": "RefId10" } ] }, diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltinPolicyDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltinPolicyDefinition.json index c40ef2c74dc9..e9fa139e0fdb 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltinPolicyDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getBuiltinPolicyDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyDefinitionName": "7433c107-6db4-4ad1-b57a-a76dce0154a1", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignment.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignment.json index f0ca8a4ac32d..0a519a063a5c 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignment.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignment.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentById.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentById.json index b208e5f63bbe..def0475fd862 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentById.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentById.json @@ -1,7 +1,7 @@ { "parameters": { "policyAssignmentId": "providers/Microsoft.Management/managementGroups/MyManagementGroup/providers/Microsoft.Authorization/policyAssignments/LowCostStorage", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentity.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentity.json index 88dbf613b125..c5b4c3dc6576 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentity.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentity.json @@ -2,7 +2,7 @@ "parameters": { "scope": "subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyAssignmentName": "EnforceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentityById.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentityById.json index e3a46ce6c7be..77c2bd48ac51 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentityById.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyAssignmentWithIdentityById.json @@ -1,7 +1,7 @@ { "parameters": { "policyAssignmentId": "providers/Microsoft.Management/managementGroups/MyManagementGroup/providers/Microsoft.Authorization/policyAssignments/LowCostStorage", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinition.json index 8c733e6c9574..d94d1cd78c82 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinitionAtManagementGroup.json index cc51c7df24f8..8768682dbc39 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicyDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policyDefinitionName": "ResourceNaming", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinition.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinition.json index cd765fcebf0c..d390e11657bd 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinition.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinition.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -17,9 +17,23 @@ "metadata": { "category": "Cost Management" }, + "policyDefinitionGroups": [ + { + "name": "CostSaving", + "displayName": "Cost Management Policies", + "description": "Policies designed to control spend within a subscription." + }, + { + "name": "Organizational", + "displayName": "Organizational Policies", + "description": "Policies that help enforce resource organization standards within a subscription." + } + ], "policyDefinitions": [ { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", + "groupName": "CostSaving", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -31,6 +45,8 @@ }, { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", + "groupName": "Organizational", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinitionAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinitionAtManagementGroup.json index 94637a0c826c..8e3c72b26e3a 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinitionAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/getPolicySetDefinitionAtManagementGroup.json @@ -2,7 +2,7 @@ "parameters": { "managementGroupId": "MyManagementGroup", "policySetDefinitionName": "CostManagement", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -20,6 +20,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -31,6 +32,7 @@ }, { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicyDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicyDefinitions.json index 30e75c86dfaf..fd975044ae01 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicyDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicyDefinitions.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -55,7 +55,7 @@ "properties": { "mode": "All", "displayName": "Allowed storage account SKUs", - "policyType": "BuiltIn", + "policyType": "Static", "description": "This policy enables you to specify a set of storage account SKUs that your organization can deploy.", "parameters": { "listOfAllowedSKUs": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicySetDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicySetDefinitions.json index 7917b62f9788..ce8b5cb24180 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicySetDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listBuiltInPolicySetDefinitions.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -18,43 +18,44 @@ "parameters": {}, "policyDefinitions": [ { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16", + "policyDefinitionReferenceId": "RefId1" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d", + "policyDefinitionReferenceId": "RefId2" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60", + "policyDefinitionReferenceId": "RefId3" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759", + "policyDefinitionReferenceId": "RefId4" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c", + "policyDefinitionReferenceId": "RefId5" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc", + "policyDefinitionReferenceId": "RefId6" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed", + "policyDefinitionReferenceId": "RefId7" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15", + "policyDefinitionReferenceId": "RefId8" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9", + "policyDefinitionReferenceId": "RefId9" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/760a85ff-6162-42b3-8d70-698e268f648c" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/201ea587-7c90-41c3-910f-c280ae01cfd6" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/9daedab3-fb2d-461e-b861-71790eead4f6" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d", + "policyDefinitionReferenceId": "RefId10" } ] }, diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignments.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignments.json index 5e38fa76ec7d..7933347233cb 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignments.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignments.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "$filter": "atScope()" }, "responses": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResource.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResource.json index 8c272aa0a1cf..b67b9679942a 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResource.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResource.json @@ -6,7 +6,7 @@ "resourceType": "domainNames", "resourceName": "MyTestComputer.cloudapp.net", "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResourceGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResourceGroup.json index 34d832550dfa..1e773185d814 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResourceGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyAssignmentsForResourceGroup.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "TestResourceGroup", "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", - "api-version": "2019-06-01", + "api-version": "2019-09-01", "$filter": "atScope()" }, "responses": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitions.json index 531be24b5f40..86093a4e2740 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitions.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitionsByManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitionsByManagementGroup.json index 41255ce25aaf..ba5a0b4be5cd 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitionsByManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicyDefinitionsByManagementGroup.json @@ -1,7 +1,7 @@ { "parameters": { "managementGroupId": "MyManagementGroup", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitions.json index 001568ae68aa..314894abfe47 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitions.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "ae640e6b-ba3e-4256-9d62-2993eecfa6f2", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -19,43 +19,44 @@ "parameters": {}, "policyDefinitions": [ { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16", + "policyDefinitionReferenceId": "RefId1" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d", + "policyDefinitionReferenceId": "RefId2" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60", + "policyDefinitionReferenceId": "RefId3" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759", + "policyDefinitionReferenceId": "RefId4" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c", + "policyDefinitionReferenceId": "RefId5" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc", + "policyDefinitionReferenceId": "RefId6" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed", + "policyDefinitionReferenceId": "RefId7" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15", + "policyDefinitionReferenceId": "RefId8" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9", + "policyDefinitionReferenceId": "RefId9" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/760a85ff-6162-42b3-8d70-698e268f648c" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/201ea587-7c90-41c3-910f-c280ae01cfd6" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/9daedab3-fb2d-461e-b861-71790eead4f6" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d", + "policyDefinitionReferenceId": "RefId10" } ] }, @@ -76,6 +77,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -87,6 +89,7 @@ }, { "policyDefinitionId": "/subscriptions/ae640e6b-ba3e-4256-9d62-2993eecfa6f2/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitionsByManagementGroup.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitionsByManagementGroup.json index 65c672d6caa4..fe0fc9b43a7b 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitionsByManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/examples/listPolicySetDefinitionsByManagementGroup.json @@ -1,7 +1,7 @@ { "parameters": { "managementGroupId": "MyManagementGroup", - "api-version": "2019-06-01" + "api-version": "2019-09-01" }, "responses": { "200": { @@ -19,43 +19,44 @@ "parameters": {}, "policyDefinitions": [ { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/a8bef009-a5c9-4d0f-90d7-6018734e8a16", + "policyDefinitionReferenceId": "RefId1" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af8051bf-258b-44e2-a2bf-165330459f9d", + "policyDefinitionReferenceId": "RefId2" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/86b3d65f-7626-441e-b690-81a8b71cff60", + "policyDefinitionReferenceId": "RefId3" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/655cb504-bcee-4362-bd4c-402e6aa38759", + "policyDefinitionReferenceId": "RefId4" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/b0f33259-77d7-4c9e-aac6-3aabcfae693c", + "policyDefinitionReferenceId": "RefId5" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/47a6b606-51aa-4496-8bb7-64b11cf66adc", + "policyDefinitionReferenceId": "RefId6" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/44452482-524f-4bf4-b852-0bff7cc4a3ed", + "policyDefinitionReferenceId": "RefId7" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e1e5fd5d-3e4c-4ce1-8661-7d1873ae6b15", + "policyDefinitionReferenceId": "RefId8" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af6cd1bd-1635-48cb-bde7-5b15693900b9", + "policyDefinitionReferenceId": "RefId9" }, { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/760a85ff-6162-42b3-8d70-698e268f648c" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/201ea587-7c90-41c3-910f-c280ae01cfd6" - }, - { - "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/9daedab3-fb2d-461e-b861-71790eead4f6" + "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0961003e-5a0a-4549-abde-af6a37f2724d", + "policyDefinitionReferenceId": "RefId10" } ] }, @@ -76,6 +77,7 @@ "policyDefinitions": [ { "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/7433c107-6db4-4ad1-b57a-a76dce0154a1", + "policyDefinitionReferenceId": "Limit_Skus", "parameters": { "listOfAllowedSKUs": { "value": [ @@ -87,6 +89,7 @@ }, { "policyDefinitionId": "/providers/Microsoft.Management/managementgroups/MyManagementGroup/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming", + "policyDefinitionReferenceId": "Resource_Naming", "parameters": { "prefix": { "value": "DeptA" diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyAssignments.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyAssignments.json index 025d358dfb2a..c5904ae8795e 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyAssignments.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyAssignments.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "PolicyClient", - "version": "2019-06-01", + "version": "2019-09-01", "description": "To manage and control access to your resources, you can define customized policies and assign them at a scope." }, "host": "management.azure.com", @@ -80,7 +80,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -142,7 +142,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -192,7 +192,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -247,7 +247,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -335,7 +335,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -383,7 +383,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -432,7 +432,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -484,7 +484,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -527,7 +527,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -535,6 +535,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyAssignmentProperties": { "properties": { "displayName": { @@ -689,24 +698,6 @@ } }, "description": "Identity for the resource." - }, - "ErrorResponse": { - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message.", - "type": "object", - "properties": { - "httpStatus": { - "description": "Http status code.", - "type": "string" - }, - "errorCode": { - "description": "Error code.", - "type": "string" - }, - "errorMessage": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } } }, "parameters": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json index f8d63a0da270..f698147a3f53 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "PolicyClient", - "version": "2019-06-01", + "version": "2019-09-01", "description": "To manage and control access to your resources, you can define customized policies and assign them at a scope." }, "host": "management.azure.com", @@ -77,6 +77,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinition" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -113,6 +119,12 @@ }, "200": { "description": "OK" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -149,6 +161,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinition" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } @@ -184,6 +202,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinition" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } @@ -231,6 +255,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinition" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -267,6 +297,12 @@ }, "200": { "description": "OK" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -303,6 +339,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinition" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } @@ -334,6 +376,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinitionListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -365,6 +413,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinitionListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -399,6 +453,12 @@ "schema": { "$ref": "#/definitions/PolicyDefinitionListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -408,15 +468,25 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyDefinitionProperties": { "properties": { "policyType": { "type": "string", - "description": "The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom.", + "description": "The type of policy definition. Possible values are NotSpecified, BuiltIn, Custom, and Static.", "enum": [ "NotSpecified", "BuiltIn", - "Custom" + "Custom", + "Static" ], "x-ms-enum": { "name": "policyType", diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json index 591123069fc3..61f65154ebf5 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "PolicyClient", - "version": "2019-06-01", + "version": "2019-09-01", "description": "To manage and control access to your resources, you can define customized policies and assign them at a scope." }, "host": "management.azure.com", @@ -45,6 +45,9 @@ "x-ms-examples": { "Create or update a policy set definition": { "$ref": "./examples/createOrUpdatePolicySetDefinition.json" + }, + "Create or update a policy set definition with groups": { + "$ref": "./examples/createOrUpdatePolicySetDefinitionWithGroups.json" } }, "parameters": [ @@ -87,7 +90,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -129,7 +132,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -171,7 +174,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -212,7 +215,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -249,7 +252,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -286,7 +289,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -306,6 +309,9 @@ "x-ms-examples": { "Create or update a policy set definition at management group level": { "$ref": "./examples/createOrUpdatePolicySetDefinitionAtManagementGroup.json" + }, + "Create or update a policy set definition with groups at management group level": { + "$ref": "./examples/createOrUpdatePolicySetDefinitionWithGroupsAtManagementGroup.json" } }, "parameters": [ @@ -348,7 +354,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -390,7 +396,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -432,7 +438,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -469,7 +475,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -480,15 +486,25 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicySetDefinitionProperties": { "properties": { "policyType": { "type": "string", - "description": "The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom.", + "description": "The type of policy definition. Possible values are NotSpecified, BuiltIn, Custom, and Static.", "enum": [ "NotSpecified", "BuiltIn", - "Custom" + "Custom", + "Static" ], "x-ms-enum": { "name": "policyType", @@ -517,6 +533,13 @@ "$ref": "#/definitions/PolicyDefinitionReference" }, "description": "An array of policy definition references." + }, + "policyDefinitionGroups": { + "type": "array", + "items": { + "$ref": "#/definitions/PolicyDefinitionGroup" + }, + "description": "The metadata describing groups of policy definition references within the policy set definition." } }, "required": [ @@ -533,10 +556,45 @@ "parameters": { "type": "object", "description": "Required if a parameter is used in policy rule." + }, + "policyDefinitionReferenceId": { + "type": "string", + "description": "A unique id (within the policy set definition) for this policy definition reference." + }, + "groupName": { + "type": "string", + "description": "The name of the group that this policy definition reference belongs to." } }, + "required": [ "policyDefinitionId" ], "description": "The policy definition reference." }, + "PolicyDefinitionGroup": { + "properties": { + "name": { + "type": "string", + "description": "The name of the group." + }, + "displayName": { + "type": "string", + "description": "The group's display name." + }, + "category": { + "type": "string", + "description": "The group's category." + }, + "description": { + "type": "string", + "description": "The group's description." + }, + "additionalMetadataId": { + "type": "string", + "description": "A resource ID of a resource that contains additional metadata about the group." + } + }, + "required": [ "name" ], + "description": "The policy definition group." + }, "PolicySetDefinition": { "properties": { "properties": { @@ -578,24 +636,6 @@ } }, "description": "List of policy set definitions." - }, - "ErrorResponse": { - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message.", - "type": "object", - "properties": { - "httpStatus": { - "description": "Http status code.", - "type": "string" - }, - "errorCode": { - "description": "Error code.", - "type": "string" - }, - "errorMessage": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } } }, "parameters": { diff --git a/specification/resources/resource-manager/readme.go.md b/specification/resources/resource-manager/readme.go.md index 7ad51fe4aeff..60c835c14584 100644 --- a/specification/resources/resource-manager/readme.go.md +++ b/specification/resources/resource-manager/readme.go.md @@ -25,6 +25,7 @@ batch: - tag: package-features-2015-12 - tag: package-locks-2016-09 - tag: package-locks-2015-01 + - tag: package-policy-2019-09 - tag: package-policy-2019-06 - tag: package-policy-2019-01 - tag: package-policy-2018-05 @@ -82,6 +83,16 @@ namespace: locks output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-01-01/locks ``` +### Tag: package-policy-2019-09 and go + +These settings apply only when `--tag=package-policy-2019-09 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-policy-2019-09' && $(go) +namespace: policy +output-folder: $(go-sdk-folder)/services/resources/mgmt/2019-09-01/policy +``` + ### Tag: package-policy-2019-06 and go These settings apply only when `--tag=package-policy-2019-06 --go` is specified on the command line. diff --git a/specification/resources/resource-manager/readme.java.md b/specification/resources/resource-manager/readme.java.md index c55819b454fe..055bd5dee813 100644 --- a/specification/resources/resource-manager/readme.java.md +++ b/specification/resources/resource-manager/readme.java.md @@ -20,6 +20,7 @@ Generate all API versions currently shipped for this package batch: - tag: package-features-2015-12 - tag: package-locks-2016-09 + - tag: package-policy-2019-09 - tag: package-policy-2019-06 - tag: package-policy-2019-01 - tag: package-policy-2018-05 @@ -65,6 +66,24 @@ generate-interface: true fconfig: '{"moduleName": "Locks"}' ``` +### Tag: package-policy-2019-09 and java + +These settings apply only when `--tag=package-policy-2019-09 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-policy-2019-09' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.policy.v2019_09_01 + output-folder: $(azure-libraries-for-java-folder)/policy/resource-manager/v2019_09_01 +regenerate-manager: true +generate-interface: true +fconfig: '{"moduleName": "Policy"}' +directive: + from: policyAssignments.json + where: $.definitions.PolicyAssignmentProperties.properties.scope + transform: $['x-ms-client-name'] = 'scopeProperty' +``` + ### Tag: package-policy-2019-06 and java These settings apply only when `--tag=package-policy-2019-06 --java` is specified on the command line. diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md index 96de4985ec6b..d80cf2f0937e 100644 --- a/specification/resources/resource-manager/readme.md +++ b/specification/resources/resource-manager/readme.md @@ -37,7 +37,7 @@ tag: package-locks-2016-09 ``` ``` yaml $(package-policy) -tag: package-policy-2019-06 +tag: package-policy-2019-09 ``` ``` yaml $(package-resources) @@ -83,6 +83,21 @@ input-file: - Microsoft.Authorization/stable/2015-01-01/locks.json ``` +### Tag: package-policy-2019-09 + +These settings apply only when `--tag=package-policy-2019-09` is specified on the command line. + +``` yaml $(tag) == 'package-policy-2019-09' +input-file: +- Microsoft.Authorization/stable/2019-09-01/policyAssignments.json +- Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json +- Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json + +# Needed when there is more than one input file +override-info: + title: PolicyClient +``` + ### Tag: package-policy-2019-06 These settings apply only when `--tag=package-policy-2019-06` is specified on the command line. @@ -532,6 +547,9 @@ input-file: - $(this-folder)/Microsoft.Features/stable/2015-12-01/features.json - $(this-folder)/Microsoft.Authorization/stable/2016-09-01/locks.json - $(this-folder)/Microsoft.Authorization/stable/2015-01-01/locks.json + - $(this-folder)/Microsoft.Authorization/stable/2019-09-01/policyAssignments.json + - $(this-folder)/Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json + - $(this-folder)/Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json - $(this-folder)/Microsoft.Authorization/stable/2019-06-01/policyAssignments.json - $(this-folder)/Microsoft.Authorization/stable/2019-06-01/policyDefinitions.json - $(this-folder)/Microsoft.Authorization/stable/2019-06-01/policySetDefinitions.json diff --git a/specification/resources/resource-manager/readme.python.md b/specification/resources/resource-manager/readme.python.md index 433fad5215c0..d0dd9e465b48 100644 --- a/specification/resources/resource-manager/readme.python.md +++ b/specification/resources/resource-manager/readme.python.md @@ -25,6 +25,7 @@ batch: - tag: package-locks-2016-09 - tag: package-locks-2015-01 - tag: package-managedapplications-2018-06 + - tag: package-policy-2019-09 - tag: package-policy-2019-06 - tag: package-policy-2019-01 - tag: package-policy-2018-05 @@ -103,6 +104,17 @@ python: output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/managedapplications ``` +### Tag: package-policy-2019-09 and python + +These settings apply only when `--tag=package-policy-2019-09 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-policy-2019-09' && $(python) +python: + namespace: azure.mgmt.resource.policy.v2019_09_01 + output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/policy/v2019_09_01 +``` + ### Tag: package-policy-2019-06 and python These settings apply only when `--tag=package-policy-2019-06 --python` is specified on the command line.