Merge pull request #1614 from camillemarie/patch-1

Remove policy resources from tenant deployment schema

Author: jorgecotillo

schemas/2019-08-01/tenantDeploymentTemplate.json

@@ -68,51 +68,6 @@
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
                   },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policyDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policyDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policyDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-01-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/resourceDefinitions/policyDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policyAssignments"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policyDefinitions"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2019-09-01/Microsoft.Authorization.json#/resourceDefinitions/policySetDefinitions"
-                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles"
                   },
@@ -761,4 +716,4 @@
       "description": "Output copy"
     }
   }
-}
+}

tools/templateTests/TenantTemplate.2019-08-01.json

@@ -291,87 +291,6 @@
           "/"
         ]
       }
-    },
-    {
-        "apiVersion": "2018-05-01",
-        "properties": {
-          "displayName": "Test Policy Set Definition",
-          "policyType": "Custom",
-          "metadata": {
-            "category": "SomeCategory",
-            "SomethingUseful": {
-              "aThing": "A thing value"
-            }
-          },
-          "parameters": {
-            "Parameter1": {
-              "type": "String",
-              "metadata": {
-                "displayName": "Parameter1",
-                "description": "The first parameter"
-              },
-              "defaultValue": "audit"
-            }
-          },
-          "policyDefinitions": [
-            {
-              "policyDefinitionReferenceId": "SomePolicyDefinitionName",
-              "policyDefinitionId": "/subscriptions/63e997c7-5fd1-4b3a-8eb5-a3dc0fb3ab6f/providers/Microsoft.Authorization/policyDefinitions/SomePolicyDefinitionName",
-              "parameters": {
-                "effect": {
-                  "value": "audit"
-                }
-              }
-            },
-            {
-              "policyDefinitionReferenceId": "AnotherPolicyDefinitionName",
-              "policyDefinitionId": "/subscriptions/63e997c7-5fd1-4b3a-8eb5-a3dc0fb3ab6f/providers/Microsoft.Authorization/policyDefinitions/AnotherPolicyDefinitionName",
-              "parameters": {
-                "effect": {
-                  "value": "[parameters('Parameter1')]"
-                }
-              }
-            }
-          ]
-        },
-        "id": "/subscriptions/63e997c7-5fd1-4b3a-8eb5-a3dc0fb3ab6f/providers/Microsoft.Authorization/policySetDefinitions/SomePolicySetDefinitionName",
-        "type": "Microsoft.Authorization/policySetDefinitions",
-        "name": "SomePolicySetDefinitionName"
-    },
-    {
-        "apiVersion": "2018-05-01",
-        "sku": {
-          "name": "A0",
-          "tier": "Free"
-        },
-        "properties": {
-          "displayName": "Test Assignment",
-          "policyDefinitionId": "/subscriptions/d5a43281-5981-4cc7-a939-6ff1ab06636a/providers/Microsoft.Authorization/policyDefinitions/SomePolicyDefinition",
-          "scope": "/subscriptions/d5a43281-5981-4cc7-a939-6ff1ab06636a/resourceGroups/SomeResourceGroup",
-          "notScopes": [
-            "/subscriptions/d5a43281-5981-4cc7-a939-6ff1ab06636a/resourceGroups/SomeResourceGroup"
-          ],
-          "parameters": {
-            "allowedLocations": {
-              "value": [
-                "centralus"
-              ]
-            }
-          },
-          "description": "Some policy assignment test",
-          "metadata": {
-            "assignedBy": "Test Writer",
-            "parameterScopes": {}
-          }
-        },
-        "identity": {
-          "principalId": "c2360c90-bab1-4e87-8ea0-da97d17c037d",
-          "tenantId": "ae0450b3-f3c6-4685-bc92-2669d7d5f810",
-          "type": "SystemAssigned"
-        },
-        "id": "/subscriptions/d5a43281-5981-4cc7-a939-6ff1ab06636a/resourceGroups/SomeResourceGroup/providers/Microsoft.Authorization/policyAssignments/TestAssignment",
-        "type": "Microsoft.Authorization/policyAssignments",
-        "name": "TestAssignment"
     }
   ]
-}
+}