Azure · jtracey93 · Apr 24, 2023 · Apr 11, 2023 · Apr 12, 2023 · Apr 18, 2023
diff --git a/accelerator/README.md b/accelerator/README.md
@@ -0,0 +1,3 @@
+# ALZ Bicep Accelerator
+
+This repo contains the Azure Landing Zones Bicep Accelerator. For additional information on the Accelerator, please refer to the [Wiki](https://github.com/Azure/ALZ-Bicep/wiki/Accelerator).
diff --git a/accelerator/pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1 b/accelerator/pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1
@@ -3,7 +3,7 @@ param (
   [String]$ConnectivitySubscriptionId = "$($env:CONNECTIVITY_SUBSCRIPTION_ID)",
 
   [Parameter()]
-  [String]$TopLevelMGPrefix = "$($env:TOP_LEVEL_MG_PREFIX)",
+  [String]$ConnectivityResourceGroup = "$($env:CONNECTIVITY_RESOURCE_GROUP)",
 
   [Parameter()]
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\hubNetworking\hubNetworking.bicep",
@@ -15,7 +15,7 @@ param (
 # Parameters necessary for deployment
 $inputObject = @{
   DeploymentName        = 'alz-Hub-and-SpokeDeploy-{0}' -f ( -join (Get-Date -Format 'yyyyMMddTHHMMssffffZ')[0..63])
-  ResourceGroupName     = "rg-$TopLevelMGPrefix-connectivity"
+  ResourceGroupName     = $ConnectivityResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
   Verbose               = $true

diff --git a/accelerator/pipeline-scripts/Deploy-ALZHub-VWAN.ps1 b/accelerator/pipeline-scripts/Deploy-ALZHub-VWAN.ps1
@@ -3,7 +3,7 @@ param (
   [String]$ConnectivitySubscriptionId = "$($env:CONNECTIVITY_SUBSCRIPTION_ID)",
 
   [Parameter()]
-  [String]$TopLevelMGPrefix = "$($env:TOP_LEVEL_MG_PREFIX)",
+  [String]$ConnectivityResourceGroup = "$($env:CONNECTIVITY_RESOURCE_GROUP)",
 
   [Parameter()]
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\vwanConnectivity\vwanConnectivity.bicep",
@@ -15,7 +15,7 @@ param (
 # Parameters necessary for deployment
 $inputObject = @{
   DeploymentName        = 'alz-VWANDeploy-{0}' -f ( -join (Get-Date -Format 'yyyyMMddTHHMMssffffZ')[0..63])
-  ResourceGroupName     = "rg-$TopLevelMGPrefix-connectivity"
+  ResourceGroupName     = $ConnectivityResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
   Verbose               = $true

diff --git a/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1 b/accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1
@@ -3,7 +3,7 @@ param (
   [String]$ManagementSubscriptionId = "$($env:MANAGEMENT_SUBSCRIPTION_ID)",
 
   [Parameter()]
-  [String]$TopLevelMGPrefix = "$($env:TOP_LEVEL_MG_PREFIX)",
+  [String]$LoggingResourceGroup = "$($env:LOGGING_RESOURCE_GROUP)",
 
   [Parameter()]
   [String]$TemplateFile = "upstream-releases\$($env:UPSTREAM_RELEASE_VERSION)\infra-as-code\bicep\modules\logging\logging.bicep",
@@ -15,7 +15,7 @@ param (
 # Parameters necessary for deployment
 $inputObject = @{
   DeploymentName        = 'alz-LoggingDeploy-{0}' -f ( -join (Get-Date -Format 'yyyyMMddTHHMMssffffZ')[0..63])
-  ResourceGroupName     = "rg-$TopLevelMGPrefix-logging"
+  ResourceGroupName     = $LoggingResourceGroup
   TemplateFile          = $TemplateFile
   TemplateParameterFile = $TemplateParameterFile
   Verbose               = $true

diff --git a/docs/wiki/Accelerator.md b/docs/wiki/Accelerator.md
@@ -0,0 +1,193 @@
+<!-- markdownlint-disable -->
+## ALZ Bicep Accelerator
+<!-- markdownlint-restore -->
+
+This document provides prescriptive guidance around implementing, automating, and maintaining your ALZ Bicep module with the ALZ Bicep Accelerator.
+
+### What is the ALZ Bicep Accelerator?
+
+The ALZ Bicep Accelerator framework was developed to provide end-users with the following abilities:
+
+- Allows for rapid onboarding and deployment of ALZ Bicep using full-fledged CI/CD pipelines with user provided input
+  > **Note**
+  > Currently we only provide support for GitHub Action workflows, but there are plans to add support for Azure Pipelines and GitLab pipelines in the future
+- Provides framework to not only stay in-sync with new [ALZ Bicep releases](https://github.com/Azure/ALZ-Bicep/releases), but also incorporates guidance around modifiying existing ALZ Bicep modules and/or associating custom modules to the framework
+- Offers branching strategy guidance and pull request pipelines for linting the repository as well as validating any existing custom and/or modified Bicep modules
+
+Accelerator Directory Tree:
+
+![Accelerator Directory Tree](media/alz-bicep-accelerator-tree-output.png)
+
+### Overview of Included ALZ Deployment Pipelines
+
+We attempted to make the pipelines as flexible as possible while also reducing overall complexity. Essentially, the ALZ Bicep Accelerator is made up four distinct deployment pipelines that represent different phases of the ALZ Bicep deployment. Each workflow shares a common set of workflow configurations and deployment scripts including the following:
+
+- Event based triggers (i.e. pushes to main and path filters for each workflow associated Bicep parameter file)
+- OpenID Connect (OIDC) authentication to Azure with the workflow permissions necessary to access the OIDC JWT ID token
+- PowerShell deployment scripts for each module that are referenced within [Azure PowerShell Action](https://github.com/marketplace/actions/azure-powershell-action) steps
+- Environment variables file (.env) which is used to store variables that are accessed within the PowerShell scripts
+
+The only thing that differs across the workflows is which ALZ Bicep modules are deployed as shown in the following table:
+
+| Workflow Name            | Modules Deployed              |
+|------------------------- |-------------------------------|
+| [ALZ-Bicep-1 Workflow](https://github.com/Azure/ALZ-Bicep/blob/main/accelerator/.github/workflows/alz-bicep-1.yml) | Management Groups Deployment, Logging and Sentinel Resource Group Deployment, Logging and Sentinel Deployment, Custom Policy Definitions Deployment, Custom Management Group Diagnostic Settings
+| [ALZ-Bicep-2 Workflow](https://github.com/Azure/ALZ-Bicep/blob/main/accelerator/.github/workflows/alz-bicep-2.yml) | Built-in and Custom Policy Assignments Deployment
+| [ALZ-Bicep-3 Workflow](https://github.com/Azure/ALZ-Bicep/blob/main/accelerator/.github/workflows/alz-bicep-3.yml) | Deploy Subscription Placement
+| [ALZ-Bicep-4a Workflow](https://github.com/Azure/ALZ-Bicep/blob/main/accelerator/.github/workflows/alz-bicep-4a.yml) | Connectivity Resource Group Deployment, Hub (Hub-and-Spoke) Deployment
+| [ALZ-Bicep-4b Workflow](https://github.com/Azure/ALZ-Bicep/blob/main/accelerator/.github/workflows/alz-bicep-4b.yml) | Connectivity Resource Group Deployment, Hub (VWAN) Deployment
+
+### Getting Started
+
+In order to setup the Accelerator framework with the production ready pipelines, the following steps must be completed in the order listed:
+
+1. Install the [ALZ PowerShell Module](https://github.com/Azure/ALZ-PowerShell-Module#installation) on your local development machine or within the Azure Cloud Shell using the following command:
+
+    > **Warning:**
+    > In order to use this module, [PowerShell 7.1 or higher](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.3) needs to be installed
+
+    ```powershell
+    Install-Module -Name ALZ
+    ```
+
+1. Before you can utilize the module, ensure you have the prerequisites installed with the following command:
+
+    ```powershell
+    Test-ALZRequirement
+    ```
+
+    Currently this tests for:
+
+    - Supported minimum PowerShell version
+    - Azure PowerShell Module
+    - Git
+    - Azure CLI
+    - Bicep
+
+1. Create your ALZ Bicep Accelerator framework with the following command:
+
+    ```powershell
+    New-ALZEnvironment -o <output_directory>
+    ```
+
+    > **Note:**
+    > If the directory structure specified for the output location does not exist, the module will create the directory structure programatically.
+
+1. Depending upon your preferred [network topology deployment](https://github.com/Azure/Enterprise-Scale/wiki/ALZ-Setup-azure#2-grant-access-to-user-andor-service-principal-at-root-scope--to-deploy-enterprise-scale-reference-implementation),  remove the associated workflow file for each deployment model
+    - Traditional VNet Hub and Spoke = .github\workflows\alz-bicep-4a.yml
+    - Virtual WAN = .github\workflows\alz-bicep-4b.yml
+
+    > **Note:**
+    > These workflow files and associated deployment scripts will be programatically removed in the future.
+
+1. Follow this [GitHub documentation](https://docs.github.com/en/enterprise-cloud@latest/get-started/quickstart/create-a-repo#create-a-repository) to create a new remote Git repository
+
+1. If you need to authenticate Git from your local workstation or from the Azure Cloud Shell, please following the steps provided [here](https://docs.github.com/en/get-started/quickstart/set-up-git#authenticating-with-github-from-git). Otherwise, proceed to the next step.
+
+1. Run the following Git commands to get your remote branch in-sync with the local branch
+
+    ```shell
+    # Matches the remote URL with a name
+    git remote add origin https://github.com/<OrganizationName>/<RepositoryName>.git
+
+    # Adds all changes in the working directory to the staging area.
+    git add .
+
+    # Records a snapshot of your repository's staging area.
+    git commit -m "Initial commit"
+
+    # Updates the remote branch with the local commit(s)
+    git push -u origin main
+    ```
+
+1. Now that the remote branch has the latest commit(s), you can configure your OpenID Connect (OIDC) identity provider with GitHub which will give the workflows access to your Azure environment.
+    1. [Create an Azure Active Directory application/service principal](https://learn.microsoft.com/en-us/azure/developer/github/connect-from-azure?tabs=azure-portal%2Cwindows#create-an-azure-active-directory-application-and-service-principal)
+    1. [Add your federated credentials](https://learn.microsoft.com/en-us/azure/developer/github/connect-from-azure?tabs=azure-portal%2Cwindows#add-federated-credentials-preview)
+    1. [Create GitHub secrets](https://learn.microsoft.com/en-us/azure/developer/github/connect-from-azure?tabs=azure-portal%2Cwindows#create-github-secrets)
+        > **Note:**
+        > The workflows reference secret names AZURE_TENANT_ID and AZURE_CLIENT_ID. If you choose to use different names, you will need to update the workflows accordingly.
+    1. [Create RBAC Assignment for the application/service principal](https://github.com/Azure/Enterprise-Scale/wiki/ALZ-Setup-azure#2-grant-access-to-user-andor-service-principal-at-root-scope--to-deploy-enterprise-scale-reference-implementation)
+
+1. All workflows are now ready to be deployed! For the initial deployment, manually trigger each workflow in the following order
+    1. ALZ-Bicep-1 Workflow
+    1. ALZ-Bicep-2 Workflow
+    1. ALZ-Bicep-3 Workflow
+    1. ALZ-Bicep-4a Workflow or ALZ-Bicep-4b Workflow
+
+1. As part of the [branching strategy](#incoporating-a-branching-strategy), setup the branch protection rules against the main branch with the following selected as a starting point:
+
+    - Require a pull request before merging
+      - Require approvals
+    - Require conversation resolution before merging
+    - Do not allow bypassing the above settings
+
+### Incoporating a Branching Strategy
+
+Branching strategies offer the ability to manage and organize changes to a codebase, reduce errors, improve collaboration, and support best practices such as testing, continuous integration and deployment, and release management.
+
+For this framework, we recommend utilizing the [GitHub Flow branching strategy](https://docs.github.com/en/get-started/quickstart/github-flow) which is a lightweight, branch-based workflow.
+
+![GitHub Flow Branching Strategy Diagram](media/alz-bicep-accelerator-branching-strategy-diagram.png)
+
+As part of the framework, we include two PR workflows. The pipelines will perform the following tasks:
+
+| Workflow Name           | Trigger   | Tasks               |
+|-------------------------|-----------|---------------------|
+| ALZ-Bicep-PR-1 Workflow | Pull request against main branch and changes to any Bicep file or Bicep config file.             | Checks to see if there are any modified or custom modules residing within the config\custom-modules directory and if so, the workflow will lint the modules and ensure they can compile.
+| ALZ-Bicep-PR-2 Workflow | Pull request against main branch. | Using [Super-Linter](https://github.com/github/super-linter), the workflow will lint everything in the codebase apart from the Bicep modules/files.
+
+### Upgrading ALZ-Bicep Versions
+
+The ALZ-Bicep repository regularly releases new [versions](https://github.com/Azure/ALZ-Bicep/releases). With each new release, the ALZ Bicep modules are updated to include new features and bug fixes. Therefore, we recommend that you upgrade to the latest version of ALZ Bicep as soon as possible.
+
+With the ALZ Accelerator framework, we have designed the pipelines and directory structure to make it easy to upgrade to the latest ALZ Bicep version. The following steps will guide you through the upgrade process.
+
+1. Prior to upgrading, read the release notes for the version you are upgrading to. The release notes will provide you with information on any breaking changes that may impact your deployment. This is especially important if you have created any custom modules or have [modified any of the ALZ Bicep modules](#incorporating-modified-alz-modules) that may have dependencies on the modules that are being upgraded.
+
+1. Using the ALZ PowerShell Module, there is a cmdlet called `Get-ALZBicepRelease`. This will download a specified release version from the remote ALZ-Bicep repository and pull down to the local directory where your Accelerator framework was initially deployed.
+
+    Here is an example of using the cmdlet to pull down version v0.13.0:
+
+    ```powershell
+    Get-ALZGithubRelease -githubRepoUrl "https://github.com/Azure/ALZ-Bicep" -releases "v0.13.0" -directoryForReleases "C:\Repos\ALZ\accelerator\upstream-releases\"
+    ```
+
+1. Once the ALZ Bicep release has been downloaded, you will need to update `upstream-releases-version` within the environment variables file (.env) with the version number of the release that you just downloaded. For example, if you downloaded v0.13.0, you would update the file with the following:
+
+    ```text
+    UPSTREAM_RELEASE_VERSION="v0.13.0"
+    ```
+
+1. You can now deploy the updated modules.
+
+### Incorporating Modified ALZ Modules
+
+We recommend that you do not modify the ALZ Bicep modules directly within the upstream-releases directory. Instead, we recommend that you copy the module file (e.g., logging.bicep, hubNetworking.bicep, etc.) that you would like to modify to the config\custom-modules directory. This will allow you to easily upgrade the ALZ Bicep version without having to worry about losing your customizations.
+
+#### Example: Steps to follow for ALZ-Bicep Logging, Automation & Sentinel Module
+
+1. Copy logging.bicep module file from upstream-releases directory to config\custom-modules directory
+
+1. Modify the copied module file in custom-modules directory as needed. If new parameters are added to the module, you will need to update the relevant parameter file in the config\custom-parameters directory as well.
+
+1. Update the config\custom-modules\logging.bicep file with the following comment at the top of the file:
+
+    `// This module has been modified from the upstream-releases version <UpstreamReleaseVersion>`
+
+1. Update the pipeline-scripts\Deploy-ALZLoggingAndSentinelResourceGroup.ps1 file and change the TemplateFile variable to point to the modified module file location as shown below:
+
+    ```powershell
+    [Parameter()]
+    [String]$TemplateFile = "config\custom-modules\logging.bicep",
+    ```
+
+1. In order to trigger new deployments when subsequent changes are made, add the new module file path to the path-based filter workflow trigger in the ALZ-Bicep-1 workflow file as shown below:
+
+    ```yaml
+    on:
+      push:
+        paths:
+          - "config/custom-modules/logging.bicep"
+    ```
+
+1. You are now ready to commit your changes to the main branch and trigger a new deployment.
diff --git a/docs/wiki/ConsumerGuide.md b/docs/wiki/ConsumerGuide.md
@@ -18,6 +18,7 @@ We authored the modules with this in mind to help consumers accelerate their jou
 
 There are various ways to consume the Bicep modules included in `ALZ-Bicep`. The options are:
 
+- Utilize the [ALZ Bicep Accelerator and associated documentation](https://github.com/Azure/ALZ-Bicep/wiki/Accelerator)
 - Clone this repository
 - Fork & Clone this repository
 - Download a `.zip` copy of this repo

diff --git a/docs/wiki/Home.md b/docs/wiki/Home.md
@@ -64,6 +64,7 @@ Replace `./` with `https://github.com/Azure/ALZ-Bicep/wiki/` when copying to her
 [wiki_deployment_flow_hs]:                            https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlowHS "Wiki - Deployment Flow - Hub and Spoke"
 [wiki_deployment_flow_vwan]:                            https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlowVWAN "Wiki - Deployment Flow - Virtual WAN"
 [wiki_consumer_guide]:                          https://github.com/Azure/ALZ-Bicep/wiki/ConsumerGuide "Wiki - Consumer Guide"
+[wiki_accelerator]:                          https://github.com/Azure/ALZ-Bicep/wiki/Accelerator "Wiki - Consumer Guide - Accelerator"
 [wiki_policy_deep_dive]:                        https://github.com/Azure/ALZ-Bicep/wiki/PolicyDeepDive "Wiki - Policy Deep Dive"
 [wiki_policy_defs]:                        https://github.com/Azure/ALZ-Bicep/wiki/AddingPolicyDefs "Wiki - Policy Definitions"
 [wiki_policy_assignments]:                        https://github.com/Azure/ALZ-Bicep/wiki/AssigningPolicies "Wiki - Policy Assignments"

diff --git a/docs/wiki/_Sidebar.md b/docs/wiki/_Sidebar.md
@@ -3,8 +3,9 @@
 * [Wiki Home](https://github.com/Azure/ALZ-Bicep/wiki/Home)
 * [Deployment Flow](https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlow)
   * [Network Topology: Hub and Spoke](https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlowHS)
-  * [Network Topology: Virtual WAN](https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlowVWAN)  
+  * [Network Topology: Virtual WAN](https://github.com/Azure/ALZ-Bicep/wiki/DeploymentFlowVWAN)
 * [Consumer Guide](https://github.com/Azure/ALZ-Bicep/wiki/ConsumerGuide)
+  * [Accelerator](https://github.com/Azure/ALZ-Bicep/wiki/Accelerator)
 * [How Does ALZ-Bicep Implement Azure Policies?](https://github.com/Azure/ALZ-Bicep/wiki/PolicyDeepDive)
   * [Adding Custom Azure Policy Definitions](https://github.com/Azure/ALZ-Bicep/wiki/AddingPolicyDefs)
   * [Assigning Azure Policies](https://github.com/Azure/ALZ-Bicep/wiki/AssigningPolicies)

diff --git a/docs/wiki/media/alz-bicep-accelerator-branching-strategy-diagram.png b/docs/wiki/media/alz-bicep-accelerator-branching-strategy-diagram.png
diff --git a/docs/wiki/media/alz-bicep-accelerator-tree-output.png b/docs/wiki/media/alz-bicep-accelerator-tree-output.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# ALZ Bicep Accelerator

		This repo contains the Azure Landing Zones Bicep Accelerator. For additional information on the Accelerator, please refer to the [Wiki](https://github.com/Azure/ALZ-Bicep/wiki/Accelerator).