Merge branch 'main' of https://github.com/Azure/ALZ-Bicep into simpli…

…fy-names
Azure · Jul 20, 2023 · 5b6d2fa · 5b6d2fa
2 parents 2334783 + 1e0c6b7
commit 5b6d2fa
Show file tree

Hide file tree

Showing 23 changed files with 134 additions and 30 deletions.
diff --git a/accelerator/.azuredevops/pipelines/alz-bicep-1-core.yml b/accelerator/.azuredevops/pipelines/alz-bicep-1-core.yml
@@ -1,6 +1,21 @@
 name: ALZ-Bicep-1-Core
 
 trigger:
+# YAML PR triggers are supported only in GitHub and Bitbucket Cloud.
+# If you use Azure Repos Git, you can configure a branch policy for build validation to trigger your build pipeline for validation.
+# https://learn.microsoft.com/en-us/azure/devops/repos/git/branch-policies#build-validation
+  branches:
+    include:
+      - "main"
+  paths:
+    include:
+      - "config/custom-parameters/managementGroups.parameters.all.json"
+      - "config/custom-parameters/resourceGroupLoggingAndSentinel.parameters.all.json"
+      - "config/custom-parameters/logging.parameters.all.json"
+      - "config/custom-parameters/customPolicyDefinitions.parameters.all.json"
+      - "config/custom-parameters/customRoleDefinitions.parameters.all.json"
+      - "config/custom-parameters/mgDiagSettingsAll.parameters.all.json"
+pr:
   branches:
     include:
       - "main"
@@ -16,6 +31,7 @@ trigger:
 variables:
   ENV_FILE: ".env"
   SERVICE_CONNECTION_NAME: "[your service connection name here]"
+  IS_PULL_REQUEST: "false"
 
 jobs:
   - job: ALZ_Bicep_1_Core
@@ -38,6 +54,11 @@ jobs:
           }
         displayName: Import Environment Variables from File
 
+      - pwsh: |
+          echo "##vso[task.setvariable variable=IS_PULL_REQUEST;]true"
+        condition: eq(variables['Build.Reason'], 'PullRequest')
+        displayName: Set IS_PULL_REQUEST Variable to True
+
       - task: AzurePowerShell@5
         displayName: "Management Groups Deployment"
         inputs:

diff --git a/accelerator/.azuredevops/pipelines/alz-bicep-2-policyassignments.yml b/accelerator/.azuredevops/pipelines/alz-bicep-2-policyassignments.yml
@@ -14,13 +14,14 @@ pr:
   branches:
     include:
       - "main"
-paths:
-  include:
-    - "config/custom-parameters/alzDefaultPolicyAssignments.parameters.all.json"
+  paths:
+    include:
+      - "config/custom-parameters/alzDefaultPolicyAssignments.parameters.all.json"
 
 variables:
   ENV_FILE: ".env"
   SERVICE_CONNECTION_NAME: "[your service connection name here]"
+  IS_PULL_REQUEST: "false"
 
 jobs:
   - job: ALZ_Bicep_2_PolicyAssignments

diff --git a/accelerator/.azuredevops/pipelines/alz-bicep-3-subplacement.yml b/accelerator/.azuredevops/pipelines/alz-bicep-3-subplacement.yml
@@ -7,16 +7,16 @@ trigger:
   branches:
     include:
       - "main"
-  paths:
-    include:
-      - "config/custom-parameters/subPlacementAll.parameters.all.json"
+    paths:
+      include:
+        - "config/custom-parameters/subPlacementAll.parameters.all.json"
 pr:
   branches:
     include:
       - "main"
-paths:
-  include:
-    - "config/custom-parameters/subPlacementAll.parameters.all.json"
+  paths:
+    include:
+      - "config/custom-parameters/subPlacementAll.parameters.all.json"
 
 variables:
   ENV_FILE: ".env"

diff --git a/accelerator/.azuredevops/pipelines/alz-bicep-4a-hubspoke.yml b/accelerator/.azuredevops/pipelines/alz-bicep-4a-hubspoke.yml
@@ -10,15 +10,15 @@ trigger:
   paths:
     include:
       - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
-      - "config/custom-parameters/vwanConnectivity.parameters.all.json"
+      - "config/custom-parameters/hubNetworking.parameters.all.json"
 pr:
   branches:
     include:
       - "main"
-paths:
-  include:
-    - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
-    - "config/custom-parameters/vwanConnectivity.parameters.all.json"
+  paths:
+    include:
+      - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
+      - "config/custom-parameters/vwanConnectivity.parameters.all.json"
 
 variables:
   ENV_FILE: ".env"

diff --git a/accelerator/.azuredevops/pipelines/alz-bicep-4b-vwan.yml b/accelerator/.azuredevops/pipelines/alz-bicep-4b-vwan.yml
@@ -15,10 +15,10 @@ pr:
   branches:
     include:
       - "main"
-paths:
-  include:
-    - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
-    - "config/custom-parameters/vwanConnectivity.parameters.all.json"
+  paths:
+    include:
+      - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
+      - "config/custom-parameters/vwanConnectivity.parameters.all.json"
 
 variables:
   ENV_FILE: ".env"

diff --git a/accelerator/.github/workflows/alz-bicep-1-core.yml b/accelerator/.github/workflows/alz-bicep-1-core.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - "main"
+  pull_request:
+    branches:
+      - "main"
     paths:
       - "config/custom-parameters/managementGroups.parameters.all.json"
       - "config/custom-parameters/resourceGroupLoggingAndSentinel.parameters.all.json"
@@ -16,9 +19,11 @@ on:
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 
 env:
   ENV_FILE: ".env"
+  IS_PULL_REQUEST: "${{ github.event_name == 'pull_request' }}"
 
 jobs:
   ALZ_Bicep_1_Core:

diff --git a/accelerator/.github/workflows/alz-bicep-2-policyassignments.yml b/accelerator/.github/workflows/alz-bicep-2-policyassignments.yml
@@ -4,16 +4,21 @@ on:
   push:
     branches:
       - "main"
+  pull_request:
+    branches:
+      - "main"
     paths:
       - "config/custom-parameters/alzDefaultPolicyAssignments.parameters.all.json"
   workflow_dispatch:
 
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 
 env:
   ENV_FILE: ".env"
+  IS_PULL_REQUEST: "${{ github.event_name == 'pull_request' }}"
 
 jobs:
   ALZ_Bicep_2_PolicyAssignments:

diff --git a/accelerator/.github/workflows/alz-bicep-3-subplacement.yml b/accelerator/.github/workflows/alz-bicep-3-subplacement.yml
@@ -4,16 +4,21 @@ on:
   push:
     branches:
       - "main"
+  pull_request:
+    branches:
+      - "main"
     paths:
       - "config/custom-parameters/subPlacementAll.parameters.all.json"
   workflow_dispatch:
 
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 
 env:
   ENV_FILE: ".env"
+  IS_PULL_REQUEST: "${{ github.event_name == 'pull_request' }}"
 
 jobs:
   ALZ_Bicep_3_SubPlacement:

diff --git a/accelerator/.github/workflows/alz-bicep-4a-hubspoke.yml b/accelerator/.github/workflows/alz-bicep-4a-hubspoke.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - "main"
+  pull_request:
+    branches:
+      - "main"
     paths:
       - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
       - "config/custom-parameters/hubNetworking.parameters.all.json"
@@ -12,9 +15,11 @@ on:
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 
 env:
   ENV_FILE: ".env"
+  IS_PULL_REQUEST: "${{ github.event_name == 'pull_request' }}"
 
 jobs:
   ALZ_Bicep_4a_HubSpoke:

diff --git a/accelerator/.github/workflows/alz-bicep-4b-vwan.yml b/accelerator/.github/workflows/alz-bicep-4b-vwan.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - "main"
+  pull_request:
+    branches:
+      - "main"
     paths:
       - "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
       - "config/custom-parameters/vwanConnectivity.parameters.all.json"
@@ -12,9 +15,11 @@ on:
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 
 env:
   ENV_FILE: ".env"
+  IS_PULL_REQUEST: "${{ github.event_name == 'pull_request' }}"
 
 jobs:
   ALZ_Bicep_4b_VWAN:

diff --git a/accelerator/pipeline-scripts/Deploy-ALZConnectivityResourceGroup.ps1 b/accelerator/pipeline-scripts/Deploy-ALZConnectivityResourceGroup.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\resourceGroup\resourceGroup.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\resourceGroupConnectivity.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\resourceGroupConnectivity.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -18,6 +21,7 @@ $inputObject = @{
   Location              = $Location
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZCustomPolicyDefinitions.ps1 b/accelerator/pipeline-scripts/Deploy-ALZCustomPolicyDefinitions.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\policy\definitions\customPolicyDefinitions.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\customPolicyDefinitions.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\customPolicyDefinitions.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -19,6 +22,7 @@ $inputObject = @{
   ManagementGroupId     = $TopLevelMGPrefix
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZCustomRoleDefinitions.ps1 b/accelerator/pipeline-scripts/Deploy-ALZCustomRoleDefinitions.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\customRoleDefinitions\customRoleDefinitions.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\customRoleDefinitions.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\customRoleDefinitions.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -19,6 +22,7 @@ $inputObject = @{
   ManagementGroupId     = $TopLevelMGPrefix
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1 b/accelerator/pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\hubNetworking\hubNetworking.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\hubNetworking.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\hubNetworking.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -18,6 +21,7 @@ $inputObject = @{
   ResourceGroupName     = $ConnectivityResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZHub-VWAN.ps1 b/accelerator/pipeline-scripts/Deploy-ALZHub-VWAN.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\vwanConnectivity\vwanConnectivity.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\vwanConnectivity.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\vwanConnectivity.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -18,6 +21,7 @@ $inputObject = @{
   ResourceGroupName     = $ConnectivityResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1 b/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\logging\logging.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\logging.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\logging.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -18,6 +21,7 @@ $inputObject = @{
   ResourceGroupName     = $LoggingResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinelResourceGroup.ps1 b/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinelResourceGroup.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\resourceGroup\resourceGroup.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\resourceGroupLoggingAndSentinel.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\resourceGroupLoggingAndSentinel.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -18,6 +21,7 @@ $inputObject = @{
   Location              = $Location
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }
 

diff --git a/accelerator/pipeline-scripts/Deploy-ALZMGDiagnosticSettings.ps1 b/accelerator/pipeline-scripts/Deploy-ALZMGDiagnosticSettings.ps1
@@ -9,7 +9,10 @@ param (
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\orchestration\mgDiagSettingsAll\mgDiagSettingsAll.bicep",
 
   [Parameter()]
-  [String]$TemplateParameterFile = "config\custom-parameters\mgDiagSettingsAll.parameters.all.json"
+  [String]$TemplateParameterFile = "config\custom-parameters\mgDiagSettingsAll.parameters.all.json",
+
+  [Parameter()]
+  [Boolean]$WhatIfEnabled = [System.Convert]::ToBoolean($($env:IS_PULL_REQUEST))
 )
 
 # Parameters necessary for deployment
@@ -19,6 +22,7 @@ $inputObject = @{
   ManagementGroupId     = $TopLevelMGPrefix
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
+  WhatIf                = $WhatIfEnabled
   Verbose               = $true
 }