Skip to content

Commit f1654e4

Browse files
authored
Updates for ALZ Bicep Accelerator (#42)
# Pull Request ## Issue General adjustments for ALZ Bicep Accelerator Issue #, if available: ## Description Description of changes: - Need to adjust the policy assignment param file as switched to the ALZ defaults. - Need to switch to orchestration version of management diagnostic setting module param file. - Switching custom modules directory to match naming convention of custom parameters directory. ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license.
1 parent ed70360 commit f1654e4

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"destination": "config/custom-parameters/managementGroups.parameters.all.json"
2424
},
2525
{
26-
"source": "infra-as-code/bicep/modules/mgDiagSettings/parameters/mgDiagSettings.parameters.all.json",
27-
"destination": "config/custom-parameters/mgDiagSettings.parameters.all.json"
26+
"source": "infra-as-code/bicep/orchestration/mgDiagSettingsAll/parameters/mgDiagSettingsAll.parameters.all.json",
27+
"destination": "config/custom-parameters/mgDiagSettingsAll.parameters.all.json"
2828
},
2929
{
30-
"source": "infra-as-code/bicep/modules/policy/assignments/parameters/policyAssignmentManagementGroup.dine.parameters.all.json",
31-
"destination": "config/custom-parameters/policyAssignmentManagementGroup.dine.parameters.all.json"
30+
"source": "infra-as-code/bicep/modules/policy/assignments/alzDefaults/parameters/alzDefaultPolicyAssignments.parameters.all.json",
31+
"destination": "config/custom-parameters/alzDefaultPolicyAssignments.parameters.all.json"
3232
},
3333
{
3434
"source": "infra-as-code/bicep/modules/resourceGroup/parameters/resourceGroup.parameters.all.json",
@@ -310,7 +310,7 @@
310310
"Valid": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
311311
"Targets": [
312312
{
313-
"Name": "parPolicyAssignmentParameters.value.emailSecurityContact.value",
313+
"Name": "parMsDefenderForCloudEmailSecurityContact.value",
314314
"Destination": "Parameters"
315315
}
316316
],
@@ -324,6 +324,10 @@
324324
{
325325
"Name": "parLogAnalyticsWorkspaceLocation.value",
326326
"Destination": "Parameters"
327+
},
328+
{
329+
"Name": "parLogAnalyticsWorkSpaceAndAutomationAccountLocation.value",
330+
"Destination": "Parameters"
327331
}
328332
]
329333
},
@@ -337,6 +341,26 @@
337341
}
338342
]
339343
},
344+
"DdosPretectionPlanId": {
345+
"Type": "Computed",
346+
"Value": "/subscriptions/{%ConnectivitySubscriptionId%}/resourceGroups/rg-{%Prefix%}-connectivity/providers/Microsoft.Network/ddosProtectionPlans/alz-ddos-plan",
347+
"Targets": [
348+
{
349+
"Name": "parDdosProtectionPlanId.value",
350+
"Destination": "Parameters"
351+
}
352+
]
353+
},
354+
"PrivateDnsResourceGroupId": {
355+
"Type": "Computed",
356+
"Value": "/subscriptions/{%ConnectivitySubscriptionId%}/resourceGroups/rg-{%Prefix%}-connectivity",
357+
"Targets": [
358+
{
359+
"Name": "parPrivateDnsResourceGroupId.value",
360+
"Destination": "Parameters"
361+
}
362+
]
363+
},
340364
"ManagementSubscriptionGroup": {
341365
"Type": "Computed",
342366
"Value": [

src/ALZ/Private/New-ALZDirectoryEnvironment.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function New-ALZDirectoryEnvironment {
1010
# Create destination file structure
1111
$gitHubPipeline = Join-Path $alzEnvironmentDestination ".github" "workflows"
1212
$config = Join-Path $alzEnvironmentDestination "config"
13-
$configModules = Join-Path $alzEnvironmentDestination "config" "modules"
13+
$configModules = Join-Path $alzEnvironmentDestination "config" "custom-modules"
1414
$upstream = Join-Path $alzEnvironmentDestination "upstream-releases"
1515

1616
New-Item -ItemType Directory -Path $alzEnvironmentDestination -Force | Out-String | Write-Verbose

0 commit comments

Comments
 (0)