Fixed rg policy

jonathan-vella · Nov 26, 2021 · efedb0f · efedb0f
1 parent 51ad06e
commit efedb0f
Show file tree

Hide file tree

Showing 64 changed files with 1,121 additions and 478 deletions.
diff --git a/Generate-Biceps.ps1 b/Generate-Biceps.ps1
@@ -1,7 +1,7 @@
 $ps = @(
  ### General
  @('mg','mg-*','Microsoft.Management/managementGroups'),
- @('rg','rg-*','Microsoft.Resources/resourceGroups'),
+ @('rg','rg-*','Microsoft.Resources/subscriptions/resourceGroups'),
  @('policy','policy-*','Microsoft.Authorization/policyDefinitions'),
  @('apim','apim-*','Microsoft.ApiManagement/service'),
  @('id','id-*','Microsoft.ManagedIdentity/userAssignedIdentities'),
@@ -43,14 +43,16 @@ $ps = @(
  @('aks','aks-*','Microsoft.ContainerService/managedClusters'),
  #@('sf','sf-*',''),
  #@('ase','ase-*',''),
- @('plan','plan-*','Microsoft.Web/serverfarms'),
- @('app','app-*','Microsoft.Web/sites'),
  #@('stapp','stapp',''),
  #@('func','func-*','Microsoft.Web/sites'), kind: "functionapp"
  #@('cld','cld-*',''),
  @('ntf','ntf-*','Microsoft.NotificationHubs/namespaces/notificationHubs'),
  @('ntfns','ntfs-*','Microsoft.NotificationHubs/namespaces'),
 
+ # One-of templates not based on module
+ #@('plan','plan-*','Microsoft.Web/serverfarms'), 
+ #@('app','app-*','Microsoft.Web/sites'), 
+
  ### Databases 
  @('sql','sql-*','Microsoft.Sql/servers'),
  @('sqldb','sqldb-*','Microsoft.Sql/servers/databases'),
@@ -113,7 +115,10 @@ $ps = @(
  #@('bp','bp-*',''),
  #@('bpa','bpa-*',''),
  @('kv','kv-*','Microsoft.KeyVault/vaults'),
- @('log','log-*','Microsoft.OperationalInsights/workspaces'),
+
+ # One-off template not based on module
+ #@('log','log-*','Microsoft.OperationalInsights/workspaces'),
+
  @('appi','appi-*','Microsoft.Insights/components'),
 
  ### Migration

diff --git a/bicep/naming-convention-rg.bicep b/bicep/naming-convention-rg.bicep
@@ -6,6 +6,6 @@ module rg '../modules/naming-convention-generic.bicep' = {
  pattern: 'rg-*'
  policyName: 'policy-naming-convention-rg'
  assignmentName: 'assignment-naming-convention-rg'
- type: 'Microsoft.Resources/resourceGroups'
+ type: 'Microsoft.Resources/subscriptions/resourceGroups'
  }
 }
diff --git a/bicep/naming-convention-stap.bicep b/bicep/naming-convention-stap.bicep
@@ -0,0 +1,11 @@
+targetScope = 'subscription'
+
+module stap '../modules/naming-convention-generic.bicep' = {
+ name: 'policy-naming-convention-stap'
+ params: {
+ pattern: 'stap-*'
+ policyName: 'policy-naming-convention-stap'
+ assignmentName: 'assignment-naming-convention-stap'
+ type: 'Microsoft.Web/staticSites'
+ }
+}
diff --git a/dist/links.txt b/dist/links.txt
diff --git a/dist/naming-convention-aa.json b/dist/naming-convention-aa.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "631566917481269233"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "8446873090382594437"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-acr.json b/dist/naming-convention-acr.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "16413849268523323661"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "11514395220464931939"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-agw.json b/dist/naming-convention-agw.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "13818346388020362651"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "10263410350231059144"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-aks.json b/dist/naming-convention-aks.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "4774043848403070754"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "5713793204619125816"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-apim.json b/dist/naming-convention-apim.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "5592379025594685919"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "6460739481788101597"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-app.json b/dist/naming-convention-app.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "17669763579272616163"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string",
@@ -74,12 +81,5 @@
  "[subscriptionResourceId('Microsoft.Authorization/policyDefinitions', 'policy-naming-convention-app')]"
  ]
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.126.58533",
- "templateHash": "16464772550086128408"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-appcs.json b/dist/naming-convention-appcs.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "12401823803509751397"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "14618296185435769258"
- }
- }
+ ]
 }
diff --git a/dist/naming-convention-appi.json b/dist/naming-convention-appi.json
@@ -1,6 +1,13 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "7006744813925474859"
+ }
+ },
  "functions": [],
  "resources": [
  {
@@ -30,6 +37,13 @@
  "template": {
  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_generator": {
+ "name": "bicep",
+ "version": "0.4.613.9944",
+ "templateHash": "1962347804019361325"
+ }
+ },
  "parameters": {
  "pattern": {
  "type": "string"
@@ -111,12 +125,5 @@
  }
  }
  }
- ],
- "metadata": {
- "_generator": {
- "name": "bicep",
- "version": "0.3.1.62928",
- "templateHash": "4204968213058471792"
- }
- }
+ ]
 }