Skip to content

Commit 415cc41

Browse files
committed
Enforce rg-stamps* prefix and environment suffix for all resource groups in Bicep files
1 parent 92cff63 commit 415cc41

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

AzureArchitecture/host-main.bicep

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ var envShort = (envMap[?toLower(environmentRaw)] ?? substring(toLower(environmen
6666

6767
// Create a resource group for global assets
6868
resource globalResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
69-
name: 'rg-global-${envShort}'
69+
name: 'rg-stamps-global-${envShort}'
7070
location: regions[0].regionName
7171
tags: union(tags, { scope: 'global' })
7272
}
7373

7474
// Create a resource group for each region
7575
resource regionResourceGroups 'Microsoft.Resources/resourceGroups@2021-04-01' = [for region in regions: {
76-
name: 'rg-region-${region.geoName}-${region.regionName}'
76+
name: 'rg-stamps-region-${region.geoName}-${region.regionName}-${envShort}'
7777
location: region.regionName
7878
tags: union(tags, { geo: region.geoName, region: region.regionName, scope: 'region' })
7979
}]
8080

8181
// Create a resource group for each CELL
8282
resource cellResourceGroups 'Microsoft.Resources/resourceGroups@2021-04-01' = [for cell in cells: {
83-
name: 'rg-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}'
83+
name: 'rg-stamps-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}-${envShort}'
8484
location: cell.regionName
8585
tags: union(tags, {
8686
geo: cell.geoName
@@ -102,7 +102,7 @@ resource cellResourceGroups 'Microsoft.Resources/resourceGroups@2021-04-01' = [f
102102
// Deploy regional modules into their region RGs
103103
module regionalNetworks './regionalNetwork.bicep' = [for (region, idx) in regions: {
104104
name: 'regionalNetwork-${region.geoName}-${region.regionName}'
105-
scope: resourceGroup('rg-region-${region.geoName}-${region.regionName}')
105+
scope: resourceGroup('rg-stamps-region-${region.geoName}-${region.regionName}-${envShort}')
106106
params: {
107107
location: region.regionName
108108
geoName: region.geoName
@@ -150,7 +150,7 @@ module regionalLayers './regionalLayer.bicep' = [for (region, idx) in regions: {
150150
// Deploy the CELL module into each dedicated RG
151151
module deploymentStampLayers './deploymentStampLayer.bicep' = [for (cell, idx) in cells: {
152152
name: 'cell-${cell.geoName}-${cell.regionName}-${cell.cellName}'
153-
scope: resourceGroup('rg-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}')
153+
scope: resourceGroup('rg-stamps-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}-${envShort}')
154154
params: {
155155
location: cell.regionName
156156
sqlServerName: toLower('sql-${(geoShortNames[?cell.geoName] ?? substring(cell.geoName, 0, 2))}-${(regionShortNames[?cell.regionName] ?? substring(cell.regionName, 0, 3))}-cell${(substring(substring(cell.cellName, length(cell.cellName) - 3, 3), 0, 2) == '00' ? substring(substring(cell.cellName, length(cell.cellName) - 3, 3), 2, 1) : (substring(substring(cell.cellName, length(cell.cellName) - 3, 3), 0, 1) == '0' ? substring(substring(cell.cellName, length(cell.cellName) - 3, 3), 1, 2) : substring(cell.cellName, length(cell.cellName) - 3, 3)))}-${envShort}')

AzureArchitecture/main.bicep

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
targetScope = 'subscription'
55
// Create a resource group for global assets
66
resource globalResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
7-
name: 'rg-global-${environment}'
7+
name: 'rg-stamps-global-${environment}'
88
location: primaryLocation
99
tags: union(baseTags, { scope: 'global' })
1010
}
1111

1212
// Create a resource group for each region
1313
resource regionResourceGroups 'Microsoft.Resources/resourceGroups@2021-04-01' = [for region in regions: {
14-
name: 'rg-region-${region.geoName}-${region.regionName}'
14+
name: 'rg-stamps-region-${region.geoName}-${region.regionName}-${environment}'
1515
location: region.regionName
1616
tags: union(baseTags, { geo: region.geoName, region: region.regionName, scope: 'region' })
1717
}]
1818

1919
// Create a resource group for each CELL
2020
resource cellResourceGroups 'Microsoft.Resources/resourceGroups@2021-04-01' = [for cell in cells: {
21-
name: 'rg-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}'
21+
name: 'rg-stamps-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}-${environment}'
2222
location: cell.regionName
2323
tags: union(baseTags, {
2424
geo: cell.geoName
@@ -236,7 +236,7 @@ var tenantValidation = [for cell in cells: {
236236
// ============ GLOBAL LAYER ============
237237
module globalLayer './globalLayer.bicep' = {
238238
name: 'globalLayer'
239-
scope: resourceGroup('rg-global-${environment}')
239+
scope: resourceGroup('rg-stamps-global-${environment}')
240240
params: {
241241
dnsZoneName: dnsZoneName
242242
trafficManagerName: trafficManagerName
@@ -260,7 +260,7 @@ module globalLayer './globalLayer.bicep' = {
260260
module keyVaults './keyvault.bicep' = [
261261
for (region, index) in regions: {
262262
name: 'keyVault-${region.geoName}-${region.regionName}'
263-
scope: resourceGroup('rg-region-${region.geoName}-${region.regionName}')
263+
scope: resourceGroup('rg-stamps-region-${region.geoName}-${region.regionName}-${environment}')
264264
params: {
265265
name: region.keyVaultName
266266
location: region.regionName
@@ -343,7 +343,7 @@ module monitoringLayers './monitoringLayer.bicep' = [
343343
module deploymentStampLayers './deploymentStampLayer.bicep' = [
344344
for (cell, index) in cells: {
345345
name: 'deploymentStampLayer-${cell.geoName}-${cell.regionName}-${cell.cellName}'
346-
scope: resourceGroup('rg-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}')
346+
scope: resourceGroup('rg-stamps-cell-${cell.geoName}-${cell.regionName}-${cell.cellName}-${environment}')
347347
params: {
348348
location: cell.regionName
349349
sqlServerName: 'sql-${cell.geoName}-${cell.regionName}-${cell.cellName}'

management-portal/infra/main.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ param location string = 'westus2'
77
param environmentName string
88

99
@description('The resource group name')
10-
param resourceGroupName string = 'rg-${environmentName}'
10+
param resourceGroupName string = 'rg-stamps-mgmt-${environmentName}'
1111

1212
// Generate resource token for unique naming
1313
var resourceToken = uniqueString(subscription().id, location, environmentName)

0 commit comments

Comments
 (0)