Merge branch 'main' into avm-bicep

Author: oZakari

src/ALZ.build.ps1

@@ -92,7 +92,7 @@ Enter-Build {
     $script:BuildModuleRootFile = Join-Path -Path $script:ModuleSourcePath -ChildPath "$($script:ModuleName).psm1"
 
     # Ensure our builds fail until if below a minimum defined code test coverage threshold
-    $script:coverageThreshold = 30
+    $script:coverageThreshold = 5
 
     [version]$script:MinPesterVersion = '5.2.2'
     [version]$script:MaxPesterVersion = '5.99.99'

src/ALZ/ALZ.psd1

@@ -30,7 +30,17 @@
     Copyright            = '(c) Microsoft Corporation. All rights reserved.'
 
     # Description of the functionality provided by this module
-    Description          = 'Azure Landing Zones Powershell Module'
+    Description          = @'
+Azure Landing Zones Powershell Module
+
+This module provides cmdlets to help deploy and manage Azure Landing Zones (ALZ) in your Azure environment.
+
+Included Cmdlets:
+- Test-AcceleratorRequirement: Tests if the current environment meets the requirements for deploying ALZ.
+- Deploy-Accelerator: Deploys the Azure Landing Zone accelerator to your Azure subscription.
+- Grant-SubscriptionCreatorRole: Grants the Subscription Creator role to a specified user or service principal.
+- Remove-PlatformLandingZone: Removes the deployed Azure Landing Zone from your Azure subscription
+'@
 
     CompatiblePSEditions = 'Core'
 
@@ -74,7 +84,8 @@
     FunctionsToExport    = @(
         'Test-AcceleratorRequirement',
         'Deploy-Accelerator',
-        'Grant-SubscriptionCreatorRole'
+        'Grant-SubscriptionCreatorRole',
+        'Remove-PlatformLandingZone'
     )
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.

src/ALZ/Private/Tools/Test-Tooling.ps1

@@ -160,15 +160,16 @@ function Test-Tooling {
     } else {
         # Check if latest ALZ module is installed
         Write-Verbose "Checking ALZ module version"
-        $alzModuleCurrentVersion = Get-InstalledModule -Name ALZ -ErrorAction SilentlyContinue
+        $alzModuleCurrentVersion = Get-InstalledPSResource -Name ALZ | Select-Object -Property Name, Version
+
         if($null -eq $alzModuleCurrentVersion) {
             $checkResults += @{
                 message = "ALZ module is not correctly installed. Please install the latest version using 'Install-Module ALZ'."
                 result  = "Failure"
             }
             $hasFailure = $true
         }
-        $alzModuleLatestVersion = Find-Module -Name ALZ
+        $alzModuleLatestVersion = Find-PSResource -Name ALZ
         if ($null -ne $alzModuleCurrentVersion) {
             if ($alzModuleCurrentVersion.Version -lt $alzModuleLatestVersion.Version) {
                 $checkResults += @{

src/ALZ/Public/Grant-SubscriptionCreatorRole.ps1

@@ -132,10 +132,9 @@ Grant-SubscriptionCreatorRole -servicePrincipalObjectId "bd42568a-7dd8-489b-bbbb
             "principalTenantId" = $tenantId
         }
     }
-    $roleAssignmentPayloadJson = $roleAssignmentHashTable | ConvertTo-Json -Depth 100 -Compress
-    $roleAssignmentPayloadJson = $roleAssignmentPayloadJson -replace '"', '\"'
+    $roleAssignmentPayloadJson = $roleAssignmentHashTable | ConvertTo-Json -Depth 100
 
-    $grantRbac = $(az rest --method PUT --url "$managementApiPrefix$($billingResourceID)/billingRoleAssignments/$($roleAssignmentName)?api-version=2024-04-01" --body $roleAssignmentPayloadJson) | ConvertFrom-Json
+    $grantRbac = $(az rest --method PUT --url "$managementApiPrefix$($billingResourceID)/billingRoleAssignments/$($roleAssignmentName)?api-version=2024-04-01" --body "$roleAssignmentPayloadJson") | ConvertFrom-Json
 
     if ($null -eq $grantRbac) {
         $errorMessage = "The 'SubscriptionCreator' role could not be granted to the service principal. Please check the error message above and try again."