Azure · jaredfholgate · Oct 2, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 28, 2024
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ templates/basic/terraform.tfvars
 templates/.test_azuredevops
 templates/.test_github
 .vscode/settings.json
+/ALZ
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -155,6 +155,30 @@ Deploy-Accelerator `
 
 ```
 
+### Bicep Local
+
+Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
+
+>IMPORTANT! - Make sure to update the input file with your settings for VCS, etc.
+
+```pwsh
+Invoke-Build -File .\src\ALZ.build.ps1
+
+$targetFolder = "dev"
+
+# Uncomment to start fresh rather than relying on the -replaceFiles parameter
+# Remove-Item -Path "/$targetFolder/acc/bicep/output/github" -Recurse -Force
+
+Deploy-Accelerator `
+    -bootstrapModuleOverrideFolderPath "/$targetFolder/code/accelerator-bootstrap-modules" `
+    -starterModuleOverrideFolderPath "/$targetFolder/code/ALZ-Bicep" `
+    -output "/$targetFolder/acc/bicep/output/local" `
+    -inputs "/$targetFolder/acc/bicep/config/inputs-local.yaml" `
+    -verbose `
+    -replaceFiles  # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
+
+```
+
 ### Terraform Azure DevOps
 
 Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
@@ -202,3 +226,27 @@ Deploy-Accelerator `
     -replaceFiles  # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
 
 ```
+
+### Terraform Local
+
+Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
+
+>IMPORTANT! - Make sure to update the input file with your settings for VCS, etc.
+
+```pwsh
+Invoke-Build -File .\src\ALZ.build.ps1
+
+$targetFolder = "dev"
+
+# Uncomment to start fresh rather than relying on the -replaceFiles parameter
+# Remove-Item -Path "/$targetFolder/acc/terraform/output/azuredevops" -Recurse -Force
+
+Deploy-Accelerator `
+    -bootstrapModuleOverrideFolderPath "/$targetFolder/code/accelerator-bootstrap-modules" `
+    -starterModuleOverrideFolderPath "/$targetFolder/code/alz-terraform-accelerator/templates" `
+    -output "/$targetFolder/acc/terraform/output/local" `
+    -inputs "/$targetFolder/acc/terraform/config/inputs-local.yaml" `
+    -verbose `
+    -replaceFiles  # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
+
+```
diff --git a/docs/wiki/[User-Guide]-Quick-Start-Phase-2-Azure-DevOps.md b/docs/wiki/[User-Guide]-Quick-Start-Phase-2-Azure-DevOps.md
diff --git a/docs/wiki/[User-Guide]-Quick-Start-Phase-2-GitHub.md b/docs/wiki/[User-Guide]-Quick-Start-Phase-2-GitHub.md
diff --git a/docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.md b/docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.md
diff --git a/docs/wiki/[User-Guide]-Quick-Start-Phase-3.md b/docs/wiki/[User-Guide]-Quick-Start-Phase-3.md
@@ -33,6 +33,22 @@ Now you have created your bootstrapped environment you can deploy you Azure land
 
 ### 3.1.3 Local file system
 
+Follow the steps below to deploy the landing zone locally. If you want to hook it up to you custom version control system, follow their documentation on how to that.
+
+#### 3.1.3.1 Bicep
+
+1. Ensure you have the latest versions of the [AZ PowerShell Module](https://learn.microsoft.com/en-us/powershell/azure/install-azure-powershell) and [Bicep](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/install) installed.
+1. Open a new PowerShell Core (pwsh) terminal or use the one you already have open.
+1. Navigate to the directory shown in the `module_output_directory_path` output from the bootstrap.
+1. Login to Azure using `Connect-AzAccount -TenantId 00000000-0000-0000-0000-000000000000 -SubscriptionId 00000000-0000-0000-0000-000000000000`.
+1. (Optional) Examine the `./scripts/deploy-local.ps1` to understand what it is doing.
+1. Run `./scripts/deploy-local.ps1`.
+1. A what if will run and then you'll be prompted to check it and run the deploy.
+1. Type `yes` and hit enter to run the deploy.
+1. The ALZ will now be deployed, this may take some time.
+
+#### 3.1.3.2 Terraform
+
 1. Open a new PowerShell Core (pwsh) terminal or use the one you already have open.
 1. Navigate to the directory shown in the `module_output_directory_path` output from the bootstrap.
 1. If you choose to deploy the bootstrap resources in Azure, then you will need to navigate to the Azure Portal and find you storage account.

diff --git a/docs/wiki/[User-Guide]-Starter-Module-Bicep-Complete.md b/docs/wiki/[User-Guide]-Starter-Module-Bicep-Complete.md
@@ -12,7 +12,7 @@ The following table describes the inputs required for the `complete` starter mod
 | Input | Placeholder | Description |
 | - | -- | --- |
 | `Prefix` | `landing-zone` | This is the defaut prefix for names of resources and management groups. |
-| `SecondaryLocation` | `westus2` | The secondary location for the landing zone. Only used if the `networkType` has a multi-region configuration specified.  |
+| `SecondaryLocation` | `westus2` | The secondary location for the landing zone. Only used if the `networkType` has a multi-region configuration specified. |
 | `Environment` | `live` | The environment name for the landing zone. This can be any lower case string. (e.g. `live` or `canary`)  |
 | `networkType` | `hubNetworking` | The type of network configuration to deploy. Currently only `hubNetworking`, `hubNetworkingMultiRegion`, `vwanConnectivity,` `vwanConnectivityMultiRegion` or `none` are supported. |
 | `SecurityContact` | `<email-address>` | The email address of the security contact for the landing zone. |

diff --git a/docs/wiki/_Sidebar.md b/docs/wiki/_Sidebar.md
@@ -19,12 +19,12 @@
     - [Terraform - Basic][wiki_starter_module_terraform_basic]
     - [Terraform - Hub Networking][wiki_starter_module_terraform_hubnetworking]
     - [Terraform - Complete][wiki_starter_module_terraform_complete]
-    - [Terraform - Complete Multi Region][wiki_starter_module_terraform_complete_multi_region]
       - [Configuration YAML Schema][wiki_yaml_schema_reference]
-      - [Example Multi Region Hub and Spoke config][example_starter_module_complete_config_hub_spoke_multi_region]
-      - [Example Multi Region Virtual WAN config][example_starter_module_complete_config_vwan_multi_region]
       - [Example Hub and Spoke config][example_starter_module_complete_config_hub_spoke]
       - [Example Virtual WAN config][example_starter_module_complete_config_vwan]
+    - [Terraform - Complete Multi Region][wiki_starter_module_terraform_complete_multi_region]
+      - [Example Multi Region Hub and Spoke config][example_starter_module_complete_config_hub_spoke_multi_region]
+      - [Example Multi Region Virtual WAN config][example_starter_module_complete_config_vwan_multi_region]
   - Input Files
     - [Azure DevOps Bicep Complete][example_powershell_inputs_azure_devops_bicep_complete]
     - [Azure DevOps Terraform Basic][example_powershell_inputs_azure_devops_terraform_basic]

diff --git a/docs/wiki/examples/powershell-inputs/inputs-azure-devops-bicep-complete.yaml b/docs/wiki/examples/powershell-inputs/inputs-azure-devops-bicep-complete.yaml
@@ -3,13 +3,13 @@
 # https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2211-azure-devops-with-bicep
 
 # Basic Inputs
-iac: "bicep"
-bootstrap: "alz_azuredevops"
-starter: "complete"
+iac_type: "bicep"
+bootstrap_module_name: "alz_azuredevops"
+starter_module_name: "complete"
 
 # Shared Interface Inputs
 bootstrap_location: "<region>"
-starter_location: "<region>"
+starter_locations: ["<region>"]
 root_parent_management_group_id: ""
 subscription_id_management: "<management-subscription-id>"
 subscription_id_identity: "<identity-subscription-id>"
@@ -19,24 +19,28 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
 azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
-use_separate_repository_for_templates: "true"
+use_separate_repository_for_templates: true
 bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
-postfix_number: "1"
-azure_devops_use_organisation_legacy_url: "false"
-azure_devops_create_project: "true"
+postfix_number: 1
+azure_devops_use_organisation_legacy_url: false
+azure_devops_create_project: true
 azure_devops_project_name: "<azure-devops-project-name>"
-use_self_hosted_agents: "true"
-use_private_networking: "true"
-allow_storage_access_from_my_ip: "false"
+use_self_hosted_agents: true
+use_private_networking: true
+allow_storage_access_from_my_ip: false
 apply_approvers: ["<email-address>"]
-create_branch_policies: "true"
+create_branch_policies: true
 
 # Complete Starter Module Specific Variables
 # (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Bicep-Complete)
 Prefix: "alz"
-SecondaryLocation: ""
 Environment: "live"
 networkType: "hubNetworking"
 SecurityContact: "<email-address>"
+
+# Advanced Inputs
+bootstrap_module_version: "latest"
+starter_module_version: "latest"
+#output_folder_path: "/accelerator/output"
diff --git a/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-basic.yaml b/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-basic.yaml
@@ -3,13 +3,13 @@
 # https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
 
 # Basic Inputs
-iac: "terraform"
-bootstrap: "alz_azuredevops"
-starter: "complete"
+iac_type: "terraform"
+bootstrap_module_name: "alz_azuredevops"
+starter_module_name: "complete"
 
 # Shared Interface Inputs
 bootstrap_location: "<region>"
-starter_location: "<region>"
+starter_locations: ["<region>"]
 root_parent_management_group_id: ""
 subscription_id_management: "<management-subscription-id>"
 subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
 azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
-use_separate_repository_for_templates: "true"
+use_separate_repository_for_templates: true
 bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
-postfix_number: "1"
-azure_devops_use_organisation_legacy_url: "false"
-azure_devops_create_project: "true"
+postfix_number: 1
+azure_devops_use_organisation_legacy_url: false
+azure_devops_create_project: true
 azure_devops_project_name: "<azure-devops-project-name>"
-use_self_hosted_agents: "true"
-use_private_networking: "true"
-allow_storage_access_from_my_ip: "false"
+use_self_hosted_agents: true
+use_private_networking: true
+allow_storage_access_from_my_ip: false
 apply_approvers: ["<email-address>"]
-create_branch_policies: "true"
+create_branch_policies: true
 
 # Basic Starter Module Specific Variables
 # (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Basic)
 root_id: "<id_prefix>"
 root_name: "<name_prefix>"
+
+# Advanced Inputs
+bootstrap_module_version: "latest"
+starter_module_version: "latest"
+#output_folder_path: "/accelerator/output"
diff --git a/.../wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete-multi-region.yaml b/.../wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete-multi-region.yaml
@@ -3,9 +3,9 @@
 # https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
 
 # Basic Inputs
-iac: "terraform"
-bootstrap: "alz_azuredevops"
-starter: "complete_multi_region"
+iac_type: "terraform"
+bootstrap_module_name: "alz_azuredevops"
+starter_module_name: "complete_multi_region"
 
 # Shared Interface Inputs
 bootstrap_location: "<region-1>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
 azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
-use_separate_repository_for_templates: "true"
+use_separate_repository_for_templates: true
 bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
-postfix_number: "1"
-azure_devops_use_organisation_legacy_url: "false"
-azure_devops_create_project: "true"
+postfix_number: 1
+azure_devops_use_organisation_legacy_url: false
+azure_devops_create_project: true
 azure_devops_project_name: "<azure-devops-project-name>"
-use_self_hosted_agents: "true"
-use_private_networking: "true"
-allow_storage_access_from_my_ip: "false"
+use_self_hosted_agents: true
+use_private_networking: true
+allow_storage_access_from_my_ip: false
 apply_approvers: ["<email-address>"]
-create_branch_policies: "true"
+create_branch_policies: true
 
 # Complete Starter Module Specific Variables
 # (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete-Multi-Region)
 configuration_file_path: "<configuration-file-path>"  # Only required for the `complete` starter module. NOTE: This must be an absolute path.
 default_postfix: "<postfix>"
+
+# Advanced Inputs
+bootstrap_module_version: "latest"
+starter_module_version: "latest"
+#output_folder_path: "/accelerator/output"
diff --git a/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete-vnext.yaml b/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete-vnext.yaml
@@ -3,13 +3,13 @@
 # https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
 
 # Basic Inputs
-iac: "terraform"
-bootstrap: "alz_azuredevops"
-starter: "complete"
+iac_type: "terraform"
+bootstrap_module_name: "alz_azuredevops"
+starter_module_name: "complete"
 
 # Shared Interface Inputs
 bootstrap_location: "<region>"
-starter_location: "<region>"
+starter_locations: ["<region>"]
 root_parent_management_group_id: ""
 subscription_id_management: "<management-subscription-id>"
 subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
 azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
-use_separate_repository_for_templates: "true"
+use_separate_repository_for_templates: true
 bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
-postfix_number: "1"
-azure_devops_use_organisation_legacy_url: "false"
-azure_devops_create_project: "true"
+postfix_number: 1
+azure_devops_use_organisation_legacy_url: false
+azure_devops_create_project: true
 azure_devops_project_name: "<azure-devops-project-name>"
-use_self_hosted_agents: "true"
-use_private_networking: "true"
-allow_storage_access_from_my_ip: "false"
+use_self_hosted_agents: true
+use_private_networking: true
+allow_storage_access_from_my_ip: false
 apply_approvers: ["<email-address>"]
-create_branch_policies: "true"
+create_branch_policies: true
 
 # Complete vNext Starter Module Specific Variables
 # (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete-vNext)
 configuration_file_path: "<configuration-file-path>"  # Only required for the `complete` starter module. NOTE: This must be an absolute path.
 default_postfix: "<postfix>"
+
+# Advanced Inputs
+bootstrap_module_version: "latest"
+starter_module_version: "latest"
+#output_folder_path: "/accelerator/output"
diff --git a/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete.yaml b/docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete.yaml
@@ -3,13 +3,13 @@
 # https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
 
 # Basic Inputs
-iac: "terraform"
-bootstrap: "alz_azuredevops"
-starter: "complete"
+iac_type: "terraform"
+bootstrap_module_name: "alz_azuredevops"
+starter_module_name: "complete"
 
 # Shared Interface Inputs
 bootstrap_location: "<region>"
-starter_location: "<region>"
+starter_locations: ["<region>"]
 root_parent_management_group_id: ""
 subscription_id_management: "<management-subscription-id>"
 subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
 azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
-use_separate_repository_for_templates: "true"
+use_separate_repository_for_templates: true
 bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
-postfix_number: "1"
-azure_devops_use_organisation_legacy_url: "false"
-azure_devops_create_project: "true"
+postfix_number: 1
+azure_devops_use_organisation_legacy_url: false
+azure_devops_create_project: true
 azure_devops_project_name: "<azure-devops-project-name>"
-use_self_hosted_agents: "true"
-use_private_networking: "true"
-allow_storage_access_from_my_ip: "false"
+use_self_hosted_agents: true
+use_private_networking: true
+allow_storage_access_from_my_ip: false
 apply_approvers: ["<email-address>"]
-create_branch_policies: "true"
+create_branch_policies: true
 
 # Complete Starter Module Specific Variables
 # (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete)
 configuration_file_path: "<configuration-file-path>"  # Only required for the `complete` starter module. NOTE: This must be an absolute path.
 default_postfix: "<postfix>"
+
+# Advanced Inputs
+bootstrap_module_version: "latest"
+starter_module_version: "latest"
+#output_folder_path: "/accelerator/output"