Skip to content

Commit b5ee84c

Browse files
oZakarioZakari
authored
fix: Clean up hardcoded resource group names and duplicate dashes (#115)
* Clean up hardcoded resource group names and duplicate dashes * Fix pull request template and update param
1 parent 14bb859 commit b5ee84c

File tree

12 files changed

+121
-122
lines changed

12 files changed

+121
-122
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Replace this with any testing evidence to show that your Pull Request works/fixe
3232

3333
## As part of this Pull Request I have
3434

35-
- [ ] Read the [Contribution Guide](https://github.com/Azure/alz-bicep-accelerator/wiki/Contributing) and ensured this PR is compliant with the guide
3635
- [ ] Checked for duplicate [Pull Requests](https://github.com/Azure/alz-bicep-accelerator/pulls)
3736
- [ ] Associated it with relevant [GitHub Issues](https://github.com/Azure/alz-bicep-accelerator/issues)
3837
- [ ] *(ALZ Bicep Core Team Only)* Associated it with relevant with `AB#` identifier [ADO Items](https://aka.ms/alz/bicep/backlog)

‎examples/platform-landing-zone.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ management_group_sandbox_name: "Sandbox"
4545
# Resource Groups
4646

4747
# These prefixes are used to name the resource groups created in the Platform Landing Zone
48-
# The naming pattern is <resource_group_name_prefix><location>
48+
# The naming pattern is <resource_group_name_prefix>-<location>
4949

50-
resource_group_logging_name_prefix: "rg-alz-logging-"
51-
resource_group_hub_networking_name_prefix: "rg-alz-conn-"
52-
resource_group_virtual_wan_name_prefix: "rg-alz-conn-"
53-
resource_group_dns_name_prefix: "rg-alz-dns-"
54-
resource_group_private_dns_resolver_name_prefix: "rg-alz-dnspr-"
50+
resource_group_logging_name_prefix: "rg-alz-logging"
51+
resource_group_hub_networking_name_prefix: "rg-alz-conn"
52+
resource_group_virtual_wan_name_prefix: "rg-alz-conn"
53+
resource_group_dns_name_prefix: "rg-alz-dns"
54+
resource_group_private_dns_resolver_name_prefix: "rg-alz-dnspr"
5555

5656
# Networking
5757

‎templates/core/governance/mgmt-groups/int-root/main.bicepparam‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ param parPolicyAssignmentParameterOverrides = {
3333
'Deploy-MDFC-Config-H224': {
3434
parameters: {
3535
logAnalytics: {
36-
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
36+
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
3737
}
3838
emailSecurityContact: {
3939
value: '[email protected]'
@@ -49,7 +49,7 @@ param parPolicyAssignmentParameterOverrides = {
4949
'Deploy-AzActivity-Log': {
5050
parameters: {
5151
logAnalytics: {
52-
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
52+
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
5353
}
5454
logsEnabled: {
5555
value: 'True'
@@ -59,7 +59,7 @@ param parPolicyAssignmentParameterOverrides = {
5959
'Deploy-Diag-LogsCat': {
6060
parameters: {
6161
logAnalytics: {
62-
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
62+
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
6363
}
6464
}
6565
}
@@ -84,7 +84,7 @@ param parPolicyAssignmentParameterOverrides = {
8484
'Deploy-AzSqlDb-Auditing': {
8585
parameters: {
8686
logAnalyticsWorkspaceResourceId: {
87-
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
87+
value: '/subscriptions/{{management_subscription_id}}/resourcegroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
8888
}
8989
}
9090
}

‎templates/core/governance/mgmt-groups/landingzones/landingzones-corp/main.bicepparam‎

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

‎templates/core/governance/mgmt-groups/landingzones/main.bicepparam‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,81 +34,81 @@ param parPolicyAssignmentParameterOverrides = {
3434
'Enable-DDoS-VNET': {
3535
parameters: {
3636
ddosPlan: {
37-
value: '/subscriptions/{{connectivity_subscription_id}}/resourceGroups/{{resource_group_hub_networking_name_prefix||rg-alz-conn-}}${parLocations[0]}/providers/Microsoft.Network/ddosProtectionPlans/ddos-alz-${parLocations[0]}'
37+
value: '/subscriptions/{{connectivity_subscription_id}}/resourceGroups/{{resource_group_hub_networking_name_prefix||rg-alz-conn}}-${parLocations[0]}/providers/Microsoft.Network/ddosProtectionPlans/ddos-alz-${parLocations[0]}'
3838
}
3939
}
4040
}
4141
'Deploy-AzSqlDb-Auditing': {
4242
parameters: {
4343
logAnalyticsWorkspaceId: {
44-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/log-alz-${parLocations[0]}'
44+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/log-alz-${parLocations[0]}'
4545
}
4646
}
4747
}
4848
'Deploy-vmArc-ChangeTrack': {
4949
parameters: {
5050
dcrResourceId: {
51-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
51+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
5252
}
5353
}
5454
}
5555
'Deploy-VM-ChangeTrack': {
5656
parameters: {
5757
dcrResourceId: {
58-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
58+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
5959
}
6060
userAssignedIdentityResourceId: {
61-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
61+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
6262
}
6363
}
6464
}
6565
'Deploy-VMSS-ChangeTrack': {
6666
parameters: {
6767
dcrResourceId: {
68-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
68+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-changetracking-${parLocations[0]}'
6969
}
7070
userAssignedIdentityResourceId: {
71-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
71+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
7272
}
7373
}
7474
}
7575
'Deploy-vmHybr-Monitoring': {
7676
parameters: {
7777
dcrResourceId: {
78-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
78+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
7979
}
8080
}
8181
}
8282
'Deploy-VM-Monitoring': {
8383
parameters: {
8484
dcrResourceId: {
85-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
85+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
8686
}
8787
userAssignedIdentityResourceId: {
88-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
88+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
8989
}
9090
}
9191
}
9292
'Deploy-VMSS-Monitoring': {
9393
parameters: {
9494
dcrResourceId: {
95-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
95+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-vminsights-${parLocations[0]}'
9696
}
9797
userAssignedIdentityResourceId: {
98-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
98+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
9999
}
100100
}
101101
}
102102
'Deploy-MDFC-DefSQL-AMA': {
103103
parameters: {
104104
userWorkspaceResourceId: {
105-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/log-alz-${parLocations[0]}'
105+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/log-alz-${parLocations[0]}'
106106
}
107107
dcrResourceId: {
108-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-mdfcsql-${parLocations[0]}'
108+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-alz-mdfcsql-${parLocations[0]}'
109109
}
110110
userAssignedIdentityResourceId: {
111-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
111+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami-alz-${parLocations[0]}'
112112
}
113113
}
114114
}

‎templates/core/governance/mgmt-groups/platform/main.bicepparam‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,67 +34,67 @@ param parPolicyAssignmentParameterOverrides = {
3434
'Deploy-VM-ChangeTrack': {
3535
parameters: {
3636
dcrResourceId: {
37-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
37+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
3838
}
3939
userAssignedIdentityResourceId: {
40-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
40+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
4141
}
4242
}
4343
}
4444
'Deploy-VM-Monitoring': {
4545
parameters: {
4646
dcrResourceId: {
47-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
47+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
4848
}
4949
userAssignedIdentityResourceId: {
50-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
50+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
5151
}
5252
}
5353
}
5454
'Deploy-VMSS-ChangeTrack': {
5555
parameters: {
5656
dcrResourceId: {
57-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
57+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
5858
}
5959
userAssignedIdentityResourceId: {
60-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
60+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
6161
}
6262
}
6363
}
6464
'Deploy-VMSS-Monitoring': {
6565
parameters: {
6666
dcrResourceId: {
67-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
67+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
6868
}
6969
userAssignedIdentityResourceId: {
70-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
70+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
7171
}
7272
}
7373
}
7474
'Deploy-vmArc-ChangeTrack': {
7575
parameters: {
7676
dcrResourceId: {
77-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
77+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-ct-alz-${parLocations[0]}'
7878
}
7979
}
8080
}
8181
'Deploy-vmHybr-Monitoring': {
8282
parameters: {
8383
dcrResourceId: {
84-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
84+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-vmi-alz-${parLocations[0]}'
8585
}
8686
}
8787
}
8888
'Deploy-MDFC-DefSQL-AMA': {
8989
parameters: {
9090
userWorkspaceResourceId: {
91-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
91+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.OperationalInsights/workspaces/law-alz-${parLocations[0]}'
9292
}
9393
dcrResourceId: {
94-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-mdfcsql-alz-${parLocations[0]}'
94+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.Insights/dataCollectionRules/dcr-mdfcsql-alz-${parLocations[0]}'
9595
}
9696
userAssignedIdentityResourceId: {
97-
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/rg-alz-mgmt-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
97+
value: '/subscriptions/{{management_subscription_id}}/resourceGroups/{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/mi-alz-${parLocations[0]}'
9898
}
9999
}
100100
}

‎templates/core/governance/mgmt-groups/platform/platform-connectivity/main.bicepparam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ param parPolicyAssignmentParameterOverrides = {
3434
'Enable-DDoS-VNET': {
3535
parameters: {
3636
ddosPlan: {
37-
value: '/subscriptions/{{connectivity_subscription_id}}/resourceGroups/{{resource_group_hub_networking_name_prefix||rg-alz-conn-}}${parLocations[0]}/providers/Microsoft.Network/ddosProtectionPlans/ddos-alz-${parLocations[0]}'
37+
value: '/subscriptions/{{connectivity_subscription_id}}/resourceGroups/{{resource_group_hub_networking_name_prefix||rg-alz-conn}}-${parLocations[0]}/providers/Microsoft.Network/ddosProtectionPlans/ddos-alz-${parLocations[0]}'
3838
}
3939
}
4040
}

‎templates/core/logging/main.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ targetScope = 'subscription'
88
//========================================
99

1010
// Resource Group Parameters
11-
@description('Optional. The name of the Resource Group.')
12-
param parMgmtLoggingResourceGroup string = ''
11+
@description('Required. The name of the Resource Group.')
12+
param parMgmtLoggingResourceGroup string
1313

1414
@description('''Resource Lock Configuration for Resource Group.
1515
- `name` - The name of the lock.

‎templates/core/logging/main.bicepparam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param parTags = {}
1414
param parEnableTelemetry = true
1515

1616
// Resource Group Parameters
17-
param parMgmtLoggingResourceGroup = '{{resource_group_logging_name_prefix||rg-alz-logging-}}${parLocations[0]}'
17+
param parMgmtLoggingResourceGroup = '{{resource_group_logging_name_prefix||rg-alz-logging}}-${parLocations[0]}'
1818

1919
// Automation Account Parameters
2020
param parAutomationAccountName = 'aa-alz-${parLocations[0]}'

0 commit comments

Comments
 (0)