Skip to content

Updates for ALZ Bicep Accelerator #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 13, 2023
Merged

Updates for ALZ Bicep Accelerator #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a967b6
Changed to ALZ default policy param file
oZakari Apr 4, 2023
1d7c2ce
Changed directory name to match param folder naming convention
oZakari Apr 4, 2023
1b2c2e0
Added changed to mg diag setting param file reference
oZakari Apr 6, 2023
f17b831
Revert "Added changed to mg diag setting param file reference"
oZakari Apr 6, 2023
329680e
Set mgdiag param file reference to all values
oZakari Apr 10, 2023
633d298
Adding replacement values for new param files
oZakari Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"destination": "config/custom-parameters/managementGroups.parameters.all.json"
},
{
"source": "infra-as-code/bicep/modules/mgDiagSettings/parameters/mgDiagSettings.parameters.all.json",
"destination": "config/custom-parameters/mgDiagSettings.parameters.all.json"
"source": "infra-as-code/bicep/orchestration/mgDiagSettingsAll/parameters/mgDiagSettingsAll.parameters.all.json",
"destination": "config/custom-parameters/mgDiagSettingsAll.parameters.all.json"
},
{
"source": "infra-as-code/bicep/modules/policy/assignments/parameters/policyAssignmentManagementGroup.dine.parameters.all.json",
"destination": "config/custom-parameters/policyAssignmentManagementGroup.dine.parameters.all.json"
"source": "infra-as-code/bicep/modules/policy/assignments/alzDefaults/parameters/alzDefaultPolicyAssignments.parameters.all.json",
"destination": "config/custom-parameters/alzDefaultPolicyAssignments.parameters.all.json"
},
{
"source": "infra-as-code/bicep/modules/resourceGroup/parameters/resourceGroup.parameters.all.json",
Expand Down Expand Up @@ -310,7 +310,7 @@
"Valid": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
"Targets": [
{
"Name": "parPolicyAssignmentParameters.value.emailSecurityContact.value",
"Name": "parMsDefenderForCloudEmailSecurityContact.value",
"Destination": "Parameters"
}
],
Expand All @@ -324,6 +324,10 @@
{
"Name": "parLogAnalyticsWorkspaceLocation.value",
"Destination": "Parameters"
},
{
"Name": "parLogAnalyticsWorkSpaceAndAutomationAccountLocation.value",
"Destination": "Parameters"
}
]
},
Expand All @@ -337,6 +341,26 @@
}
]
},
"DdosPretectionPlanId": {
"Type": "Computed",
"Value": "/subscriptions/{%ConnectivitySubscriptionId%}/resourceGroups/rg-{%Prefix%}-connectivity/providers/Microsoft.Network/ddosProtectionPlans/alz-ddos-plan",
"Targets": [
{
"Name": "parDdosProtectionPlanId.value",
"Destination": "Parameters"
}
]
},
"PrivateDnsResourceGroupId": {
"Type": "Computed",
"Value": "/subscriptions/{%ConnectivitySubscriptionId%}/resourceGroups/rg-{%Prefix%}-connectivity",
"Targets": [
{
"Name": "parPrivateDnsResourceGroupId.value",
"Destination": "Parameters"
}
]
},
"ManagementSubscriptionGroup": {
"Type": "Computed",
"Value": [
Expand Down
2 changes: 1 addition & 1 deletion src/ALZ/Private/New-ALZDirectoryEnvironment.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function New-ALZDirectoryEnvironment {
# Create destination file structure
$gitHubPipeline = Join-Path $alzEnvironmentDestination ".github" "workflows"
$config = Join-Path $alzEnvironmentDestination "config"
$configModules = Join-Path $alzEnvironmentDestination "config" "modules"
$configModules = Join-Path $alzEnvironmentDestination "config" "custom-modules"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See how quickly I lose context after a few days away :D This is adopting a directory name change in ALZ-Bicep?

$upstream = Join-Path $alzEnvironmentDestination "upstream-releases"

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