adding pol test 2 button

kramit · Mar 29, 2020 · 0ca286e · 0ca286e
1 parent 70cf9b1
commit 0ca286e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 48 deletions.
diff --git a/templates/policytest/README.md b/templates/policytest/README.md
@@ -1,7 +1,3 @@
-# Deployment of 2 resource groups
-
-
-
 <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fkramit%2FAZ103-Notes%2Fmaster%2Ftemplates%2Fpolicytest%2Fazuredeploy.json" target="_blank">
     <img src="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.png"/>
 </a>
diff --git a/templates/policytest/azuredeploy.json b/templates/policytest/azuredeploy.json
@@ -4,53 +4,57 @@
   "parameters": {
     "rgName": {
       "type": "string"
-    },
-    "rgLocation": {
-      "type": "string",
-      "defaultValue": "eastus"
     }
 
   },
-  "variables": {},
+  "variables": {
+  },
   "resources": [
     {
-      "type": "Microsoft.Resources/resourceGroups",
+      "type": "Microsoft.Authorization/policyDefinitions",
       "apiVersion": "2018-05-01",
-      "name": "[parameters('rgName')]",
-      "location": "[parameters('rgLocation')]",
-      "properties": {}
-    },
-    {
-        "type": "Microsoft.Authorization/policyDefinitions",
-        "apiVersion": "2018-05-01",
-        "name": "locationpolicy",
-        "properties": {
-          "policyType": "Custom",
-          "parameters": {},
-          "policyRule": {
-            "if": {
-              "field": "location",
-              "equals": "northeurope"
-            },
-            "then": {
-              "effect": "deny"
-            }
+      "name": "locationpolicy",
+      "properties": {
+        "policyType": "Custom",
+        "parameters": {
+        },
+        "policyRule": {
+          "if": {
+            "allOf": [
+              {
+                "field": "type",
+                "equals": "Microsoft.Compute/virtualMachines"
+              },
+              {
+                "not": {
+                  "field": "Microsoft.Compute/virtualMachines/sku.name",
+                  "in": [
+                    "Standard_DS3_v2"
+                  ]
+                }
+              }
+            ]
+          },
+          "then": {
+            "effect": "Deny"
           }
         }
-      },
-      {
-        "type": "Microsoft.Authorization/policyAssignments",
-        "apiVersion": "2018-05-01",
-        "name": "location-lock",
-        "dependsOn": [
-          "locationpolicy"
-        ],
-        "properties": {
-          "scope": "[subscription().id]",
-          "policyDefinitionId": "[resourceId('Microsoft.Authorization/policyDefinitions', 'locationpolicy')]"
-        }
       }
-
+    },
+    {
+      "type": "Microsoft.Authorization/policyAssignments",
+      "apiVersion": "2018-05-01",
+      "name": "location-lock",
+      "dependsOn": [
+        "locationpolicy"
+      ],
+      "properties": {
+        "scope": "[concat('/subscription/', subscription().Id, '/resourceGroups/', resourceGroup().name)]",
+        "policyDefinitionId": "[resourceId('Microsoft.Authorization/policyDefinitions', 'locationpolicy')]"
+      }
+    }
+
   ],
-  "outputs": {}
+  "outputs": {
+  }
 }
diff --git a/templates/policytest/azuredeploy.parameters.json b/templates/policytest/azuredeploy.parameters.json
@@ -4,9 +4,6 @@
   "parameters": {
     "rgName": {
       "value": "az104-06-rg01"
-    },
-    "rgLocation": {
-      "value": "eastus"
     }
   }
 }
diff --git a/templates/policytest/deploy.sh b/templates/policytest/deploy.sh
@@ -1,4 +1,2 @@
 #!/bin/bash
-echo "Deploying template for module 6"
-echo "Deploying 2 resource groups"
 az deployment create --name "null" --location "eastus" --template-file azuredeploy.json --parameters azuredeploy.parameters.json
diff --git a/templates/policytestvm/README.md b/templates/policytestvm/README.md
@@ -0,0 +1,4 @@
+
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fkramit%2FAZ103-Notes%2Fmaster%2Ftemplates%2Fpolicytestvm%2Faz104-04-vms-template.json" target="_blank">
+    <img src="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.png"/>
+</a>