Module Bicep template and parameter file hygiene (#227)

* [arameters updates * updates * updates * updates * updates * Update and rename vnetPeeringVwan.parameters.example.json to virtualNetworkPeer.parameters.example.json * Create aaa.json * Rename aaa.json to virtualNetworkPeer.minimum.parameters.example.json * updates * updates * updates * updates * File hygiene: containerRegistry module. * File hygiene: subscriptionAlias module. * File hygiene: customRoleDefinitions module. * File hygiene: hubNetworking module. * File hygiene: logging module. * File hygiene: managementGroups module. * File hygiene: privateDnsZones module. * File hygiene: publicIp module. * File hygiene: resourceGroup module. * File hygiene: roleAssignments module. * File hygiene: spokeNetworking module. * File hygiene: subscriptionPlacement module. * File hygiene: unstable/orchestration module. * File hygiene: vnetPeering module. * File hygiene: vnetPeeringVwan module. * File hygiene: vwanConnectivity module. * Delete old virtualNetworkPeer module remnants. * File hygiene: policy module. * File hygiene: Update test pipeline for new file paths and names. * File hygiene: Fix policy module README. * File hygiene: Fix Markdown Lint Check errors. * File hygiene: camelCase orchHubSpoke.bicep in build validation workflow. * camelCase par, var, res, mod, out: customRoleDefinitions module. * camelCase par, var, res, mod, out: hubNetworking module. * camelCase par, var, res, mod, out: logging module. * camelCase par, var, res, mod, out: managementGroups module. * camelCase par, var, res, mod, out: policy module. * camelCase par, var, res, mod, out: privateDnsZones module. * camelCase par, var, res, mod, out: publicIp module. * camelCase par, var, res, mod, out: resourceGroup module. * camelCase par, var, res, mod, out: roleAssignments module. * camelCase par, var, res, mod, out: spokeNetworking module. * camelCase par, var, res, mod, out: subscriptionPlacement module. * camelCase par, var, res, mod, out: orchestration module. * camelCase par, var, res, mod, out: vnetPeering module. * camelCase par, var, res, mod, out: vnetPeeringVwan module. * camelCase par, var, res, mod, out: vwanConnectivity module. * camelCase par, var, res, mod, out: scripts and pipelines. * Corrected outputs and other naming in READMEs * Removed duplicate parTelemetryOptOut value. * Fixed dead link in vwanConnectivity README. * Changing parDdosEnabled to false for mc- parameter files since Mooncake does not support DDoS * Fixed casing issue introduced by merging of main. * PR review feedback. * Reset Az Policy Assignment names. * Fixed parBgpRoutePropagationDisabled linting errors. * Removed duplicate parameter. * fix missing parTelemetryOptOut in mc-custompolicy * fix missing parTelemetryOptOut in mc-customroledef * add missing EOL character to PwSh command * Added eslint rules to ignore inline JSON comments. * fix paths and readme for hubPeeredSpoke * Update hubPeeredSpoke.parameters.all.json set parTelemetryOptOut to false * Set parTelemetryOptOut to false * Cleaned yml to pass linting. * Added newline at end of .markdown-lint.yml to pass linting. * Converted CRLF to LF. * fix bash variable setting commands * Updated WIKI to accurately reflect template and parameter file names. * Updated README with NOTE to replace xxxxxxx with appropriate region in parPrivateDnsZones * Removed parPrivateDnsZones parameter * Consolidated regional DNS to bottom of parPrivateDnsZones array to make editing easier * fix linting * Linting fix. * Rename parDisableBgpRoutePropagation to align with ARM API surface. * Minor corrections to orchestration module and README.md * Renamed parDnsServerIpArray to parDnsServerIps * Added parameters/ to README * Updated contribution guide to account for camelCasing and parameter file naming. * Fixed linting in Contributing.md Co-authored-by: danycontre <[email protected]> Co-authored-by: danycontre <[email protected]> Co-authored-by: Jack Tracey <[email protected]> Co-authored-by: Ryan Graham <[email protected]> Co-authored-by: Jan Faurskov <[email protected]> Co-authored-by: Eric Henry <[email protected]>
Azure · Jun 9, 2022 · 48bb2d4 · 48bb2d4
1 parent 8e56dac
commit 48bb2d4
Show file tree

Hide file tree

Showing 174 changed files with 4,786 additions and 3,343 deletions.
diff --git a/.github/linters/.eslintrc.yml b/.github/linters/.eslintrc.yml
@@ -0,0 +1,73 @@
+---
+#############################
+#############################
+## JavaScript Linter rules ##
+#############################
+#############################
+
+############
+# Env Vars #
+############
+env:
+  browser: true
+  es6: true
+  jest: true
+
+###############
+# Global Vars #
+###############
+globals:
+  Atomics: readonly
+  SharedArrayBuffer: readonly
+
+###############
+# Parser vars #
+###############
+parser: "@typescript-eslint/parser"
+parserOptions:
+  ecmaVersion: 2018
+  sourceType: module
+
+###########
+# Plugins #
+###########
+plugins:
+  - "@typescript-eslint"
+
+#########
+# Rules #
+#########
+rules: { }
+
+##############################
+# Overrides for JSON parsing #
+##############################
+overrides:
+  # JSON files
+  - files:
+      - "*.json"
+    extends:
+      - plugin:jsonc/recommended-with-json
+    parser: jsonc-eslint-parser
+    parserOptions:
+      jsonSyntax: JSONC
+    rules:
+      "jsonc/no-comments": "warn"
+
+  # JSONC files
+  - files:
+      - "*.jsonc"
+    extends:
+      - plugin:jsonc/recommended-with-jsonc
+    parser: jsonc-eslint-parser
+    parserOptions:
+      jsonSyntax: JSONC
+
+  # JSON5 files
+  - files:
+      - "*.json5"
+    extends:
+      - plugin:jsonc/recommended-with-json5
+    parser: jsonc-eslint-parser
+    parserOptions:
+      jsonSyntax: JSON5
diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
@@ -32,4 +32,4 @@ MD036: false                  # Emphasis used instead of a heading
 #################
 # Rules by tags #
 #################
-blank_lines: false  # Error on blank lines
+blank_lines: false  # Error on blank lines
diff --git a/.github/scripts/EnterpriseScaleLibraryTools/EnterpriseScaleLibraryTools.psm1 b/.github/scripts/EnterpriseScaleLibraryTools/EnterpriseScaleLibraryTools.psm1
@@ -502,7 +502,7 @@ class ArmTemplateResource : ESLTBase {
     [Object] ToTemplateFile() {
         if ($this.type -eq "Microsoft.Authorization/policyAssignments") {
             $this.properties.scope = "`${current_scope_resource_id}"
-            $this.properties.policyDefinitionId = "`${varTargetManagementGroupResourceID}/"
+            $this.properties.policyDefinitionId = "`${varTargetManagementGroupResourceId}/"
             $this.location = "`${default_location}"
         }
         if ($this.type -eq "Microsoft.Authorization/policyDefinitions") {
@@ -513,7 +513,7 @@ class ArmTemplateResource : ESLTBase {
             foreach ($policyDefinition in $this.properties.policyDefinitions) {
                 $regexMatches = [ArmTemplateResource]::regexExtractProviderId.Matches($policyDefinition.policyDefinitionId)
                 if ($regexMatches.Index -gt 0) {
-                    $policyDefinition.policyDefinitionId = "`${varTargetManagementGroupResourceID}$($regexMatches.Value)"
+                    $policyDefinition.policyDefinitionId = "`${varTargetManagementGroupResourceId}$($regexMatches.Value)"
                 }
                 else {
                     $policyDefinition.policyDefinitionId = $regexMatches.Value

diff --git a/.github/scripts/Invoke-PolicyToBicep-China.ps1 b/.github/scripts/Invoke-PolicyToBicep-China.ps1
@@ -96,9 +96,9 @@ Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/definitions/l
     if (($policySetDefinitionsOutputForBicep.Count) -ne 0) {
         $policySetDefinitionsOutputForBicep.Keys | Sort-Object | ForEach-Object {
             $definitionReferenceId = $_
-            $definitionID = $($policySetDefinitionsOutputForBicep[$_])
+            $definitionId = $($policySetDefinitionsOutputForBicep[$_])
             # Add nested array of objects to each Policy Set/Initiative Definition in the Bicep variable
-            Add-Content -Path "./infra-as-code/bicep/modules/policy/definitions/lib/china/policy_set_definitions/_mc_policySetDefinitionsBicepInput.txt" -Encoding "utf8" -Value "`t`t{`r`n`t`t`tdefinitionReferenceID: '$definitionReferenceId'`r`n`t`t`tdefinitionID: '$definitionID'`r`n`t`t`tdefinitionParameters: json(loadTextContent('lib/china/policy_set_definitions/$parametersFileName')).$definitionReferenceId.parameters`r`n`t`t}"
+            Add-Content -Path "./infra-as-code/bicep/modules/policy/definitions/lib/china/policy_set_definitions/_mc_policySetDefinitionsBicepInput.txt" -Encoding "utf8" -Value "`t`t{`r`n`t`t`tdefinitionReferenceId: '$definitionReferenceId'`r`n`t`t`tdefinitionId: '$definitionId'`r`n`t`t`tdefinitionParameters: json(loadTextContent('lib/china/policy_set_definitions/$parametersFileName')).$definitionReferenceId.parameters`r`n`t`t}"
         }
     }
 
@@ -128,7 +128,7 @@ Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/assignments/l
     $policyAssignmentNameNoHyphens = $policyAssignmentName.replace("-","")
 
     Write-Information "==> Adding '$policyAssignmentName' to '$PWD/_policyAssignmentsBicepInput.txt'" -InformationAction Continue
-    Add-Content -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/_policyAssignmentsBicepInput.txt" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionID: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: json(loadTextContent('../../policy/assignments/lib/policy_assignments/$fileName'))`r`n}`r`n"
+    Add-Content -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/_policyAssignmentsBicepInput.txt" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: json(loadTextContent('../../policy/assignments/lib/policy_assignments/$fileName'))`r`n}`r`n"
 }
 
 $policyAssignmentCount = Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments" -Filter "*.json" | Measure-Object

diff --git a/.github/scripts/Invoke-PolicyToBicep.ps1 b/.github/scripts/Invoke-PolicyToBicep.ps1
@@ -96,9 +96,9 @@ Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/definitions/l
     if (($policySetDefinitionsOutputForBicep.Count) -ne 0) {
         $policySetDefinitionsOutputForBicep.Keys | Sort-Object | ForEach-Object {
             $definitionReferenceId = $_
-            $definitionID = $($policySetDefinitionsOutputForBicep[$_])
+            $definitionId = $($policySetDefinitionsOutputForBicep[$_])
             # Add nested array of objects to each Policy Set/Initiative Definition in the Bicep variable
-            Add-Content -Path "./infra-as-code/bicep/modules/policy/definitions/lib/policy_set_definitions/_policySetDefinitionsBicepInput.txt" -Encoding "utf8" -Value "`t`t{`r`n`t`t`tdefinitionReferenceID: '$definitionReferenceId'`r`n`t`t`tdefinitionID: '$definitionID'`r`n`t`t`tdefinitionParameters: json(loadTextContent('lib/policy_set_definitions/$parametersFileName')).$definitionReferenceId.parameters`r`n`t`t}"
+            Add-Content -Path "./infra-as-code/bicep/modules/policy/definitions/lib/policy_set_definitions/_policySetDefinitionsBicepInput.txt" -Encoding "utf8" -Value "`t`t{`r`n`t`t`tdefinitionReferenceId: '$definitionReferenceId'`r`n`t`t`tdefinitionId: '$definitionId'`r`n`t`t`tdefinitionParameters: json(loadTextContent('lib/policy_set_definitions/$parametersFileName')).$definitionReferenceId.parameters`r`n`t`t}"
         }
     }
 
@@ -128,7 +128,7 @@ Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/assignments/l
     $policyAssignmentNameNoHyphens = $policyAssignmentName.replace("-","")
 
     Write-Information "==> Adding '$policyAssignmentName' to '$PWD/_policyAssignmentsBicepInput.txt'" -InformationAction Continue
-    Add-Content -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/_policyAssignmentsBicepInput.txt" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionID: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: json(loadTextContent('../../policy/assignments/lib/policy_assignments/$fileName'))`r`n}`r`n"
+    Add-Content -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/_policyAssignmentsBicepInput.txt" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: json(loadTextContent('../../policy/assignments/lib/policy_assignments/$fileName'))`r`n}`r`n"
 }
 
 $policyAssignmentCount = Get-ChildItem -Recurse -Path "./infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments" -Filter "*.json" | Measure-Object

diff --git a/.github/workflows/bicep-build-to-validate.yml b/.github/workflows/bicep-build-to-validate.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Bicep Build & Lint All Modules
         shell: pwsh
         run: |
-          Get-ChildItem -Recurse -Filter '*.bicep' -Exclude 'callModuleFromACR.example.bicep','orch-hubSpoke.bicep' | ForEach-Object {
+          Get-ChildItem -Recurse -Filter '*.bicep' -Exclude 'callModuleFromACR.example.bicep','orchHubSpoke.bicep' | ForEach-Object {
               Write-Information "==> Attempting Bicep Build For File: $_" -InformationAction Continue
               $output = bicep build $_.FullName 2>&1
               if ($LastExitCode -ne 0)

diff --git a/docs/wiki/Contributing.md b/docs/wiki/Contributing.md
@@ -70,13 +70,15 @@ Throughout the development of Bicep code you should follow the [Bicep Best Pract
 
 ### Bicep Code Styling
 
-- Camel Casing must be used for all elements:
+- Strict `camelCasing` must be used for all elements:
   - Symbolic names for:
     - Parameters
     - Variables
     - Resource
     - Modules
     - Outputs
+- All `par` and `out` values in Bicep templates should include full product name instead of `camelCased` abbreviation, for example: `parExpressRouteGwName` instead of `parErGwName`
+- Services with "Azure" in the name are abbreviated "Az", for example: `parAzBastionName` instead of `parAzureBastionName`
 - Use [parameter decorators](https://docs.microsoft.com/azure/azure-resource-manager/bicep/parameters#decorators) to ensure integrity of user inputs are complete and therefore enable successful deployment
   - Only use the [`@secure()` parameter decorator](https://docs.microsoft.com/azure/azure-resource-manager/bicep/parameters#secure-parameters) for inputs. Never for outputs as this is not stored securely and will be stored/shown as plain-text!
 - Comments should be provided where additional information/description of what is happening is required, except when a decorator like `@description('Example description')` is providing adequate coverage
@@ -233,4 +235,11 @@ To author Bicep modules that are in-line with the requirements for this project,
             }
       ```
 
-  - The Bicep module file & parameters file, complete with default values.
+  - The Bicep module file
+  - A `parameters` folder that will contain the parameters files for the module
+  - Parameters `...all.json` and `...min.json` files based on file naming convention below
+  - Parameter files should be named according to the convention: `<module>.<parameterSet>.parameters.<min|all>.json`
+    - `<module>` denotes the current module (and scope when necessary), for example: `roleAssignmentManagementGroup`
+    - `<parameterSet>` denotes a set of parameters with similar characteristics, for example: `securityGroup`
+    - `parameters` constant to denote the file as a parameters file
+    - `<min|all>.json` denotes whether a parameter file contains all possible parameters or only minimum necessary for deployment
diff --git a/docs/wiki/PipelinesADO.md b/docs/wiki/PipelinesADO.md
@@ -57,8 +57,8 @@ jobs:
       scriptLocation: 'inlineScript'
       inlineScript: |
         az deployment mg create \
-        --template-file infra-as-code/bicep/modules/policy/definitions/custom-policy-definitions.bicep  \
-        --parameters @infra-as-code/bicep/modules/policy/definitions/custom-policy-definitions.parameters.example.json \
+        --template-file infra-as-code/bicep/modules/policy/definitions/customPolicyDefinitions.bicep  \
+        --parameters @infra-as-code/bicep/modules/policy/definitions/parameters/customPolicyDefinitions.parameters.all.json \
         --location $(Location) \
         --management-group-id $(ManagementGroupPrefix) \
         --name create_policy_defs-$(RunNumber)
@@ -73,7 +73,7 @@ jobs:
       inlineScript: |
         az deployment mg create \
         --template-file infra-as-code/bicep/modules/customRoleDefinitions/customRoleDefinitions.bicep \
-        --parameters @infra-as-code/bicep/modules/customRoleDefinitions/customRoleDefinitions.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/customRoleDefinitions/parameters/customRoleDefinitions.parameters.all.json \
         --location $(Location) \
         --management-group-id $(ManagementGroupPrefix) \
         --name create_rbac_roles-$(RunNumber)
@@ -105,7 +105,7 @@ jobs:
         az deployment group create \
         --resource-group $(LoggingResourceGroupName) \
         --template-file infra-as-code/bicep/modules/logging/logging.bicep \
-        --parameters @infra-as-code/bicep/modules/logging/logging.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json \
         --name create_logging-$(RunNumber)
 
   - task: AzureCLI@2
@@ -135,7 +135,7 @@ jobs:
         az deployment group create \
         --resource-group $(HubNetworkResourceGroupName) \
         --template-file infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep \
-        --parameters @infra-as-code/bicep/modules/hubNetworking/hubNetworking.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json \
         --name create_hub_network-$(RunNumber)
 
   - task: AzureCLI@2
@@ -148,7 +148,7 @@ jobs:
       inlineScript: |
         az deployment mg create \
         --template-file infra-as-code/bicep/modules/roleAssignments/roleAssignmentManagementGroup.bicep \
-        --parameters @infra-as-code/bicep/modules/roleAssignments/roleAssignmentManagementGroup.parameters.service-principal.example.json \
+        --parameters @infra-as-code/bicep/modules/roleAssignments/parameters/roleAssignmentManagementGroup.servicePrincipal.parameters.all.json \
         --location $(Location) \
         --management-group-id $(RoleAssignmentManagementGroupId) \
         --name create_role_assignment-$(RunNumber)
@@ -163,7 +163,7 @@ jobs:
       inlineScript: |
         az deployment mg create \
         --template-file infra-as-code/bicep/modules/subscriptionPlacement/subscriptionPlacement.bicep \
-        --parameters @infra-as-code/bicep/modules/subscriptionPlacement/subscriptionPlacement.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/subscriptionPlacement/parameters/subscriptionPlacement.parameters.all.json \
         --location $(Location) \
         --management-group-id $(ManagementGroupPrefix) \
         --name create_subscription_placement-$(RunNumber)
@@ -178,7 +178,7 @@ jobs:
       inlineScript: |
         az deployment mg create \
         --template-file infra-as-code/bicep/modules/policy/assignments/alzDefaults/alzDefaultPolicyAssignments.bicep \
-        --parameters @infra-as-code/bicep/modules/policy/assignments/alzDefaults/alzDefaultPolicyAssignments.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/policy/assignments/alzDefaults/parameters/alzDefaultPolicyAssignments.parameters.all.json \
         --location $(Location) \
         --management-group-id $(ManagementGroupPrefix) \
         --name create_policy_assignments-$(RunNumber)
@@ -210,6 +210,6 @@ jobs:
         az deployment group create \
         --resource-group $(SpokeNetworkResourceGroupName) \
         --template-file infra-as-code/bicep/modules/spokeNetworking/spokeNetworking.bicep \
-        --parameters @infra-as-code/bicep/modules/spokeNetworking/spokeNetworking.parameters.example.json \
+        --parameters @infra-as-code/bicep/modules/spokeNetworking/parameters/spokeNetworking.parameters.all.json \
         --name create_spoke_network-$(RunNumber)    
 ```
diff --git a/docs/wiki/PipelinesGitHub.md b/docs/wiki/PipelinesGitHub.md
@@ -55,8 +55,8 @@ jobs:
           scope: managementgroup
           managementGroupId: ${{ env.ManagementGroupPrefix }}
           region: ${{ env.Location }}
-          template: infra-as-code/bicep/modules/policy/definitions/custom-policy-definitions.bicep
-          parameters: infra-as-code/bicep/modules/policy/definitions/custom-policy-definitions.parameters.example.json
+          template: infra-as-code/bicep/modules/policy/definitions/customPolicyDefinitions.bicep
+          parameters: infra-as-code/bicep/modules/policy/definitions/parameters/customPolicyDefinitions.parameters.all.json
           deploymentName: create_policy_defs-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -68,7 +68,7 @@ jobs:
           managementGroupId: ${{ env.ManagementGroupPrefix }}
           region: ${{ env.Location }}
           template: infra-as-code/bicep/modules/customRoleDefinitions/customRoleDefinitions.bicep
-          parameters: infra-as-code/bicep/modules/customRoleDefinitions/customRoleDefinitions.parameters.example.json
+          parameters: infra-as-code/bicep/modules/customRoleDefinitions/parameters/customRoleDefinitions.parameters.all.json
           deploymentName: create_rbac_roles-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -91,7 +91,7 @@ jobs:
           subscriptionId: ${{ env.LoggingSubId }}
           resourceGroupName: ${{ env.LoggingResourceGroupName }}
           template: infra-as-code/bicep/modules/logging/logging.bicep
-          parameters: infra-as-code/bicep/modules/logging/logging.parameters.example.json
+          parameters: infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json
           deploymentName: create_logging-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -114,7 +114,7 @@ jobs:
           subscriptionId: ${{ env.HubNetworkSubId }}
           resourceGroupName: ${{ env.HubNetworkResourceGroupName }}
           template: infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep
-          parameters: infra-as-code/bicep/modules/hubNetworking/hubNetworking.parameters.example.json
+          parameters: infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json
           deploymentName: create_hub_network-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -126,7 +126,7 @@ jobs:
           managementGroupId: ${{ env.RoleAssignmentManagementGroupId }}
           region: ${{ env.Location }}
           template: infra-as-code/bicep/modules/roleAssignments/roleAssignmentManagementGroup.bicep
-          parameters: infra-as-code/bicep/modules/roleAssignments/roleAssignmentManagementGroup.parameters.service-principal.example.json
+          parameters: infra-as-code/bicep/modules/roleAssignments/parameters/roleAssignmentManagementGroup.servicePrincipal.parameters.all.json
           deploymentName: create_role_assignment-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -138,7 +138,7 @@ jobs:
           managementGroupId: ${{ env.ManagementGroupPrefix }}
           region: ${{ env.Location }}
           template: infra-as-code/bicep/modules/subscriptionPlacement/subscriptionPlacement.bicep
-          parameters: infra-as-code/bicep/modules/subscriptionPlacement/subscriptionPlacement.parameters.example.json
+          parameters: infra-as-code/bicep/modules/subscriptionPlacement/parameters/subscriptionPlacement.parameters.all.json
           deploymentName: create_subscription_placement-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -150,7 +150,7 @@ jobs:
           managementGroupId: ${{ env.ManagementGroupPrefix }}
           region: ${{ env.Location }}
           template: infra-as-code/bicep/modules/policy/assignments/alzDefaults/alzDefaultPolicyAssignments.bicep
-          parameters: infra-as-code/bicep/modules/policy/assignments/alzDefaults/alzDefaultPolicyAssignments.parameters.example.json
+          parameters: infra-as-code/bicep/modules/policy/assignments/alzDefaults/parameters/alzDefaultPolicyAssignments.parameters.all.json
           deploymentName: create_policy_assignments-${{ env.runNumber }}
           failOnStdErr: false
 
@@ -173,7 +173,7 @@ jobs:
           subscriptionId: ${{ env.SpokeNetworkSubId }}
           resourceGroupName: ${{ env.SpokeNetworkResourceGroupName }}
           template: infra-as-code/bicep/modules/spokeNetworking/spokeNetworking.bicep
-          parameters: infra-as-code/bicep/modules/spokeNetworking/spokeNetworking.parameters.example.json
+          parameters: infra-as-code/bicep/modules/spokeNetworking/parameters/spokeNetworking.parameters.all.json
           deploymentName: create_spoke_network-${{ env.runNumber }}
           failOnStdErr: false
 ```