Added usage of CICR function

Azure · Sep 2, 2023 · a307f05 · a307f05
1 parent b424999
commit a307f05
Show file tree

Hide file tree

Showing 210 changed files with 881 additions and 203 deletions.
diff --git a/modules/aad/domain-service/.test/common/dependencies.bicep b/modules/aad/domain-service/.test/common/dependencies.bicep
@@ -30,7 +30,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]

diff --git a/modules/aad/domain-service/README.md b/modules/aad/domain-service/README.md
@@ -253,6 +253,7 @@ module domainService './aad/domain-service/main.bicep' = {
     sku: 'Standard'
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -322,6 +323,7 @@ module domainService './aad/domain-service/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }

diff --git a/modules/analysis-services/server/README.md b/modules/analysis-services/server/README.md
@@ -199,6 +199,7 @@ module server './analysis-services/server/main.bicep' = {
     skuName: 'S0'
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -257,6 +258,7 @@ module server './analysis-services/server/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }

diff --git a/modules/api-management/service/README.md b/modules/api-management/service/README.md
@@ -331,6 +331,7 @@ module service './api-management/service/main.bicep' = {
     ]
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -408,6 +409,7 @@ module service './api-management/service/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }
@@ -557,6 +559,7 @@ module service './api-management/service/main.bicep' = {
     systemAssignedIdentity: true
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
     userAssignedIdentities: {
@@ -750,6 +753,7 @@ module service './api-management/service/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     },

diff --git a/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep b/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep
@@ -19,7 +19,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]

diff --git a/modules/app-configuration/configuration-store/README.md b/modules/app-configuration/configuration-store/README.md
@@ -367,6 +367,7 @@ module configurationStore './app-configuration/configuration-store/main.bicep' =
     systemAssignedIdentity: true
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -455,6 +456,7 @@ module configurationStore './app-configuration/configuration-store/main.bicep' =
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }
@@ -538,13 +540,15 @@ module configurationStore './app-configuration/configuration-store/main.bicep' =
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
           Role: 'DeploymentValidation'
         }
       }
     ]
     softDeleteRetentionInDays: 1
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -592,6 +596,7 @@ module configurationStore './app-configuration/configuration-store/main.bicep' =
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
         }
@@ -603,6 +608,7 @@ module configurationStore './app-configuration/configuration-store/main.bicep' =
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }

diff --git a/modules/app/container-app/README.md b/modules/app/container-app/README.md
@@ -271,6 +271,7 @@ module containerApp './app/container-app/main.bicep' = {
     }
     tags: {
       Env: 'test'
+      'hidden-title': 'This is visible in the resource name'
     }
     userAssignedIdentities: {
       '<managedIdentityResourceId>': {}
@@ -349,7 +350,8 @@ module containerApp './app/container-app/main.bicep' = {
     },
     "tags": {
       "value": {
-        "Env": "test"
+        "Env": "test",
+        "hidden-title": "This is visible in the resource name"
       }
     },
     "userAssignedIdentities": {
@@ -392,6 +394,7 @@ module containerApp './app/container-app/main.bicep' = {
     location: '<location>'
     tags: {
       Env: 'test'
+      'hidden-title': 'This is visible in the resource name'
     }
   }
 }
@@ -437,7 +440,8 @@ module containerApp './app/container-app/main.bicep' = {
     },
     "tags": {
       "value": {
-        "Env": "test"
+        "Env": "test",
+        "hidden-title": "This is visible in the resource name"
       }
     }
   }

diff --git a/modules/app/managed-environment/.test/common/dependencies.bicep b/modules/app/managed-environment/.test/common/dependencies.bicep
@@ -8,7 +8,6 @@ param logAnalyticsWorkspaceName string
 param virtualNetworkName string
 
 var addressPrefix = '10.0.0.0/16'
-var subnetAddressPrefix = '10.0.0.0/23'
 
 resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = {
   name: logAnalyticsWorkspaceName
@@ -37,7 +36,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: subnetAddressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
         }
       }
     ]

diff --git a/modules/app/managed-environment/README.md b/modules/app/managed-environment/README.md
@@ -202,6 +202,7 @@ module managedEnvironment './app/managed-environment/main.bicep' = {
     skuName: 'Consumption'
     tags: {
       Env: 'test'
+      'hidden-title': 'This is visible in the resource name'
     }
   }
 }
@@ -256,7 +257,8 @@ module managedEnvironment './app/managed-environment/main.bicep' = {
     },
     "tags": {
       "value": {
-        "Env": "test"
+        "Env": "test",
+        "hidden-title": "This is visible in the resource name"
       }
     }
   }

diff --git a/modules/automation/automation-account/.test/common/dependencies.bicep b/modules/automation/automation-account/.test/common/dependencies.bicep
@@ -25,7 +25,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]

diff --git a/modules/automation/automation-account/README.md b/modules/automation/automation-account/README.md
@@ -445,6 +445,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
           Role: 'DeploymentValidation'
         }
       }
@@ -458,6 +459,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
           Role: 'DeploymentValidation'
         }
       }
@@ -551,6 +553,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
     systemAssignedIdentity: true
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
     userAssignedIdentities: {
@@ -667,6 +670,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
         },
@@ -680,6 +684,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
         }
@@ -785,6 +790,7 @@ module automationAccount './automation/automation-account/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     },

diff --git a/modules/batch/batch-account/.test/common/dependencies.bicep b/modules/batch/batch-account/.test/common/dependencies.bicep
@@ -34,7 +34,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]

diff --git a/modules/batch/batch-account/.test/encr/dependencies.bicep b/modules/batch/batch-account/.test/encr/dependencies.bicep
@@ -37,7 +37,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]

diff --git a/modules/batch/batch-account/README.md b/modules/batch/batch-account/README.md
@@ -305,6 +305,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
           Role: 'DeploymentValidation'
         }
       }
@@ -314,6 +315,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
     systemAssignedIdentity: true
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
   }
@@ -382,6 +384,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
         }
@@ -399,6 +402,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     }
@@ -438,6 +442,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
           Role: 'DeploymentValidation'
         }
       }
@@ -446,6 +451,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
     storageAuthenticationMode: 'BatchAccountManagedIdentity'
     tags: {
       Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
     userAssignedIdentities: {
@@ -499,6 +505,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
         }
@@ -513,6 +520,7 @@ module batchAccount './batch/batch-account/main.bicep' = {
     "tags": {
       "value": {
         "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
     },

diff --git a/modules/cache/redis/.test/common/dependencies.bicep b/modules/cache/redis/.test/common/dependencies.bicep
@@ -19,7 +19,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
       {
         name: 'defaultSubnet'
         properties: {
-          addressPrefix: addressPrefix
+          addressPrefix: cidrSubnet(addressPrefix, 16, 0)
+          serviceEndpoints: [
+            {
+              service: 'Microsoft.KeyVault'
+            }
+          ]
         }
       }
     ]