feat: Integration of AVM based alz-bicep-accelerator (#456)

# Pull Request


## Description

This pull request introduces support for the new "Bicep AVM" framework
alongside the existing "Bicep Classic" and "Terraform" options for Azure
Landing Zones. The changes update documentation, parameter handling, and
logic throughout the codebase to enable users to select and deploy using
any of these Infrastructure as Code approaches.

**Documentation and User Experience Improvements:**

* Updated `README.md` to clarify supported IaC types, now listing
"bicep-avm" (Bicep AVM), "bicep" (Bicep Classic), and "terraform", with
links and descriptions for each approach.
* Improved user input options in `Request-SpecialInput` to distinguish
between "Bicep AVM" (new framework) and "Bicep Classic" (classic
framework), ensuring clear selection for users.
* Updated help messages in `Deploy-Accelerator` to reflect the new
supported IaC types, including "bicep-avm".

**Core Logic and Configuration Updates:**

* Modified logic in `New-Bootstrap` to handle both "bicep" and
"bicep-avm" types for configuration conversion, file copying, and
editing, ensuring both frameworks are supported throughout the
deployment process.
[[1]](diffhunk://#diff-f91dfbd454641bb81b16c9268caa2dd2ed4b48a9a7d0a68d497d69623b26d48aL146-R146)
[[2]](diffhunk://#diff-f91dfbd454641bb81b16c9268caa2dd2ed4b48a9a7d0a68d497d69623b26d48aL251-R251)
* Enhanced file retention logic in `New-Bootstrap` to include additional
configuration directories (such as `.config`) for better compatibility
with the new framework.

**Robustness Improvements:**

* Improved file retention logic in `Remove-UnrequiredFileSet` to skip
null or empty values, preventing errors during cleanup operations.

## License

By submitting this pull request, I confirm that my contribution is made
under the terms of the projects associated license.

Author: oZakari

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -46,10 +46,8 @@ body:
       description: Which starter module are you using?
       multiple: false
       options:
-        - bicep - complete
+        - bicep - platform_landing_zone
         - terraform - platform_landing_zone
-        - terraform - microsoft_cloud_for_sovereignty
-        - terraform - microsoft_cloud_for_financial_services
         - other
         - not relevant
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -33,10 +33,8 @@ body:
       description: Which starter module are you using?
       multiple: false
       options:
-        - bicep - complete
+        - bicep - platform_landing_zone
         - terraform - platform_landing_zone
-        - terraform - microsoft_cloud_for_sovereignty
-        - terraform - microsoft_cloud_for_financial_services
         - other
         - not relevant
     validations:

README.md

@@ -8,9 +8,17 @@
 
 ## Introduction
 
-This repository contains the PowerShell module and documentation for the Azure landing zones Accelerators for Bicep and Terraform. The accelerators are an opinionated implementation of the Azure Landing Zones Terraform modules, with Azure DevOps or GitHub bootstrapping.
+This repository contains the PowerShell module and documentation for the Azure landing zones Accelerators for Bicep and Terraform. The accelerators are an opinionated implementation of the Azure Landing Zones modules, with Azure DevOps or GitHub bootstrapping.
 
-It is designed to be used as a template to enable you to get started quickly deploying ALZ with Bicep or Terraform.
+## Supported Infrastructure as Code (IaC) Types
+
+The accelerators support multiple Infrastructure as Code approaches:
+
+- **terraform**: Terraform-based Azure Landing Zones
+- **bicep**: Bicep-based Azure Landing Zones using the new [alz-bicep-accelerator](https://github.com/Azure/alz-bicep-accelerator) framework built on Azure Verified Modules
+- **bicep-classic**: Bicep-based Azure Landing Zones using the classic [ALZ-Bicep](https://github.com/Azure/ALZ-Bicep) framework
+
+It is designed to be used as a template to enable you to get started quickly deploying ALZ with any of these approaches.
 
 Please refer to our [Docs](https://aka.ms/alz/acc) for detailed features and usage instructions.
 

src/ALZ/Private/Config-Helpers/Convert-BicepConfigToInputConfig.ps1

@@ -4,9 +4,6 @@ function Convert-BicepConfigToInputConfig {
         [Parameter(Mandatory = $false)]
         [PSCustomObject]$bicepConfig,
 
-        [Parameter(Mandatory = $false)]
-        [PSCustomObject]$validators,
-
         [Parameter(Mandatory = $false)]
         [PSCustomObject]$appendToObject = $null
     )
@@ -18,8 +15,6 @@ function Convert-BicepConfigToInputConfig {
             $configItems = $appendToObject
         }
 
-        Write-Verbose $validators
-
         foreach ($variable in $bicepConfig.inputs.PSObject.Properties) {
             Write-Verbose "Parsing variable $($variable.Name)"
             $description = $variable.Value.description
@@ -45,20 +40,6 @@ function Convert-BicepConfigToInputConfig {
                 $configItem | Add-Member -NotePropertyName "DefaultValue" -NotePropertyValue $defaultValue
             }
 
-            if ($variable.Value.PSObject.Properties.Name -contains "validation") {
-                $validationType = $variable.Value.validation
-                $validator = $validators.PSObject.Properties[$validationType].Value
-                $description = "$description ($($validator.Description))"
-                Write-Verbose "Adding $($variable.Value.validation) validation for $($variable.Name). Validation type: $($validator.Type)"
-                if ($validator.Type -eq "AllowedValues") {
-                    $configItem | Add-Member -NotePropertyName "AllowedValues" -NotePropertyValue $validator.AllowedValues
-                }
-                if ($validator.Type -eq "Valid") {
-                    $configItem | Add-Member -NotePropertyName "Valid" -NotePropertyValue $validator.Valid
-                }
-                $configItem | Add-Member -NotePropertyName "Validator" -NotePropertyValue $validationType
-            }
-
             if ($variable.Value.PSObject.Properties.Name -contains "targets") {
                 $configItem | Add-Member -NotePropertyName "targets" -NotePropertyValue $variable.Value.targets
             }

src/ALZ/Private/Config-Helpers/Convert-HCLVariablesToInputConfig.ps1

@@ -7,9 +7,6 @@ function Convert-HCLVariablesToInputConfig {
         [Parameter(Mandatory = $false)]
         [string] $hclParserToolPath,
 
-        [Parameter(Mandatory = $false)]
-        [PSCustomObject]$validators,
-
         [Parameter(Mandatory = $false)]
         [PSCustomObject]$appendToObject = $null
     )
@@ -32,19 +29,6 @@ function Convert-HCLVariablesToInputConfig {
         foreach ($variable in $terraformVariables.variable.PSObject.Properties) {
             if ($variable.Value[0].PSObject.Properties.Name -contains "description") {
                 $description = $variable.Value[0].description
-                $validationTypeSplit = $description -split "\|"
-
-                $hasValidation = $false
-
-                if ($validationTypeSplit.Length -gt 1) {
-                    $description = $validationTypeSplit[0].Trim()
-                }
-
-                if ($validationTypeSplit.Length -eq 2) {
-                    $splitItem = $validationTypeSplit[1].Trim()
-                    $validationType = $splitItem
-                    $hasValidation = $true
-                }
             }
 
             $configItem = [PSCustomObject]@{}
@@ -55,18 +39,6 @@ function Convert-HCLVariablesToInputConfig {
                 $configItem | Add-Member -NotePropertyName "DefaultValue" -NotePropertyValue $variable.Value[0].default
             }
 
-            if ($hasValidation) {
-                $validator = $validators.PSObject.Properties[$validationType].Value
-                $description = "$description ($($validator.Description))"
-                if ($validator.Type -eq "AllowedValues") {
-                    $configItem | Add-Member -NotePropertyName "AllowedValues" -NotePropertyValue $validator.AllowedValues
-                }
-                if ($validator.Type -eq "Valid") {
-                    $configItem | Add-Member -NotePropertyName "Valid" -NotePropertyValue $validator.Valid
-                }
-                $configItem | Add-Member -NotePropertyName "Validator" -NotePropertyValue $validationType
-            }
-
             $configItem | Add-Member -NotePropertyName "Description" -NotePropertyValue $description
 
             Write-Verbose "Adding variable $($variable.Name) to the configuration..."

src/ALZ/Private/Config-Helpers/Remove-TerraformMetaFileSet.ps1

@@ -19,8 +19,10 @@ function Remove-TerraformMetaFileSet {
     )
 
     if ($PSCmdlet.ShouldProcess("Remove files", "modify")) {
+        Write-Verbose "Removing Terraform meta files and folders from $path"
+
         if ($terraformFilesOrFoldersToRemove.Length -eq 0 ) {
-            Write-Verbose "No folders or files specified, so not removing aything from $path"
+            Write-Verbose "No folders or files specified, so not removing anything from $path"
             return
         }
 

src/ALZ/Private/Config-Helpers/Remove-UnrequiredFileSet.ps1

@@ -24,6 +24,10 @@ function Remove-UnrequiredFileSet {
             $fileRelativePath = $file.FullName.Replace($path, "").Replace("\", "/").TrimStart("/")
             $folderRelativePath = $file.Directory.FullName.Replace($path, "").Replace("\", "/").TrimStart("/")
             foreach ($folderOrFileToRetain in $foldersOrFilesToRetain) {
+                # Skip null or empty values
+                if ([string]::IsNullOrWhiteSpace($folderOrFileToRetain)) {
+                    continue
+                }
                 # If we have an exact match of the file name and path, always retain it.
                 if ($folderOrFileToRetain.TrimStart("./") -eq $fileRelativePath) {
                     if ($writeVerboseLogs) {

src/ALZ/Private/Config-Helpers/Request-SpecialInput.ps1

@@ -143,8 +143,6 @@ function Set-Config {
                 continue
             }
 
-            # TODO: Add validation here...
-
             # Use the default value if no input config is supplied
             if($configurationValue.Value.PSObject.Properties.Name -match "DefaultValue") {
                 Write-Verbose "Input not supplied, so using default value of $($configurationValue.Value.DefaultValue) for $($configurationValue.Name)"

src/ALZ/Private/Config-Helpers/Set-Config.ps1

@@ -17,6 +17,7 @@ function Copy-ParametersFileCollection {
                 if (-not (Test-Path $destinationFolder)) {
                     New-Item -ItemType Directory -Path $destinationFolder -Force | Out-String | Write-Verbose
                 }
+                Write-Verbose "Copying parameter file from $sourcePath to $destinationPath"
                 Copy-Item -Path $sourcePath -Destination $destinationPath -Recurse -Force | Out-String | Write-Verbose
             }
         } else {