improve

Author: jaredfholgate

src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1

@@ -20,7 +20,10 @@ function Invoke-Terraform {
         [string] $outputFilePath = "",
 
         [Parameter(Mandatory = $false)]
-        [switch] $silent
+        [switch] $silent,
+
+        [Parameter(Mandatory = $false)]
+        [string] $bootstrapSubscriptionId = ""
     )
 
     # Resolve to absolute path for `terraform -chdir` switch
@@ -31,9 +34,19 @@ function Invoke-Terraform {
         $removeSubscriptionId = $false
         if ($null -eq $env:ARM_SUBSCRIPTION_ID -or $env:ARM_SUBSCRIPTION_ID -eq "") {
             Write-Verbose "Setting environment variable ARM_SUBSCRIPTION_ID"
-            $subscriptionId = $(az account show --query id -o tsv)
+
+            $subscriptionId = ""
+            if ($bootstrapSubscriptionId -ne "") {
+                # Use the provided bootstrap subscription ID
+                Write-Verbose "Using provided bootstrap_subscription_id: $bootstrapSubscriptionId"
+                $subscriptionId = $bootstrapSubscriptionId
+            } else {
+                # Fall back to az cli
+                $subscriptionId = $(az account show --query id -o tsv)
+            }
+
             if ($null -eq $subscriptionId -or $subscriptionId -eq "") {
-                Write-Error "Subscription ID not found. Please ensure you are logged in to Azure and have selected a subscription. Use 'az account show' to check."
+                Write-Error "Subscription ID not found. Please ensure you are logged in to Azure and have selected a subscription, or provide bootstrap_subscription_id. Use 'az account show' to check."
                 return
             }
             $env:ARM_SUBSCRIPTION_ID = $subscriptionId

src/ALZ/Private/Deploy-Accelerator-Helpers/New-Bootstrap.ps1

@@ -292,11 +292,17 @@ function New-Bootstrap {
         # Running terraform init and apply
         Write-InformationColored "Thank you for providing those inputs, we are now initializing and applying Terraform to bootstrap your environment..." -ForegroundColor Green -NewLineBefore -InformationAction Continue
 
+        # Get bootstrap_subscription_id from inputConfig if available
+        $bootstrapSubscriptionId = ""
+        if ($null -ne $inputConfig.bootstrap_subscription_id -and $null -ne $inputConfig.bootstrap_subscription_id.Value) {
+            $bootstrapSubscriptionId = $inputConfig.bootstrap_subscription_id.Value
+        }
+
         if ($autoApprove) {
-            Invoke-Terraform -moduleFolderPath $bootstrapModulePath -autoApprove -destroy:$destroy.IsPresent
+            Invoke-Terraform -moduleFolderPath $bootstrapModulePath -autoApprove -destroy:$destroy.IsPresent -bootstrapSubscriptionId $bootstrapSubscriptionId
         } else {
             Write-InformationColored "Once the plan is complete you will be prompted to confirm the apply." -ForegroundColor Green -NewLineBefore -InformationAction Continue
-            Invoke-Terraform -moduleFolderPath $bootstrapModulePath -destroy:$destroy.IsPresent
+            Invoke-Terraform -moduleFolderPath $bootstrapModulePath -destroy:$destroy.IsPresent -bootstrapSubscriptionId $bootstrapSubscriptionId
         }
 
         Write-InformationColored "Bootstrap has completed successfully! Thanks for using our tool. Head over to Phase 3 in the documentation to continue..." -ForegroundColor Green -NewLineBefore -InformationAction Continue

src/ALZ/Private/Deploy-Accelerator-Helpers/Request-ALZConfigurationValue.ps1

@@ -617,7 +617,7 @@ function Request-ALZConfigurationValue {
                         if ([string]::IsNullOrWhiteSpace($oldValue)) {
                             # Empty value - match key followed by colon and optional whitespace/quotes
                             $pattern = "(?m)^(\s*${key}:\s*)`"?`"?(\s*)(#.*)?$"
-                            $replacement = "`${1}`"$newValue`"`${3}"
+                            $replacement = "`${1}`"$newValue`"`${2}`${3}"
                         } else {
                             # Non-empty value - match the specific value
                             $pattern = "(?m)^(\s*${key}:\s*)`"?${escapedOldValue}`"?(\s*)(#.*)?$"

src/ALZ/Private/Deploy-Accelerator-Helpers/Request-AcceleratorConfigurationInput.ps1

@@ -6,8 +6,6 @@ function Request-AcceleratorConfigurationInput {
     This function interactively prompts the user for the inputs needed to set up the accelerator folder structure,
     calls New-AcceleratorFolderStructure to create the folders and configuration files, and returns the paths
     needed for Deploy-Accelerator to continue.
-    .PARAMETER AzureContext
-    A hashtable containing Azure context information including ManagementGroups and Subscriptions arrays.
     .OUTPUTS
     Returns a hashtable with the following keys:
     - Continue: Boolean indicating whether to continue with deployment
@@ -16,10 +14,7 @@ function Request-AcceleratorConfigurationInput {
     - OutputFolderPath: Path to the output folder
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
-    param(
-        [Parameter(Mandatory = $false)]
-        [hashtable] $AzureContext = @{ ManagementGroups = @(); Subscriptions = @() }
-    )
+    param()
 
     if ($PSCmdlet.ShouldProcess("Accelerator folder structure setup", "prompt and create")) {
         Write-InformationColored "No input configuration files provided. Let's set up the accelerator folder structure first..." -ForegroundColor Green -NewLineBefore -InformationAction Continue
@@ -215,11 +210,14 @@ function Request-AcceleratorConfigurationInput {
         # Offer to configure inputs interactively (default is Yes)
         $configureNowResponse = Read-Host "`nWould you like to configure the input values interactively now? (Y/n)"
         if ($configureNowResponse -ne "n" -and $configureNowResponse -ne "N") {
+            # Query Azure for management groups and subscriptions (for interactive selection)
+            $azureContext = Get-AzureContext
+
             Request-ALZConfigurationValue `
                 -ConfigFolderPath $configFolderPath `
                 -IacType $selectedIacType `
                 -VersionControl $selectedVersionControl `
-                -AzureContext $AzureContext
+                -AzureContext $azureContext
         }
 
         # Check for VS Code or VS Code Insiders and offer to open the config folder

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

@@ -6,11 +6,14 @@ function Test-Tooling {
         [Parameter(Mandatory = $false)]
         [switch]$checkYamlModule,
         [Parameter(Mandatory = $false)]
-        [switch]$skipYamlModuleInstall
+        [switch]$skipYamlModuleInstall,
+        [Parameter(Mandatory = $false)]
+        [switch]$skipAzureLoginCheck
     )
 
     $checkResults = @()
     $hasFailure = $false
+    $azCliInstalledButNotLoggedIn = $false
 
     # Check if PowerShell is the correct version
     Write-Verbose "Checking PowerShell version"
@@ -134,25 +137,33 @@ function Test-Tooling {
                 message = "Azure CLI is installed."
                 result  = "Success"
             }
-        } else {
-            $checkResults += @{
-                message = "Azure CLI is not installed. Follow the instructions here: https://learn.microsoft.com/en-us/cli/azure/install-azure-cli"
-                result  = "Failure"
-            }
-            $hasFailure = $true
-        }
 
-        # Check if Azure CLI is logged in
-        Write-Verbose "Checking Azure CLI login status"
-        $azCliAccount = $(az account show -o json) | ConvertFrom-Json
-        if ($azCliAccount) {
-            $checkResults += @{
-                message = "Azure CLI is logged in. Tenant ID: $($azCliAccount.tenantId), Subscription: $($azCliAccount.name) ($($azCliAccount.id))"
-                result  = "Success"
+            # Check if Azure CLI is logged in
+            Write-Verbose "Checking Azure CLI login status"
+            $azCliAccount = $(az account show -o json 2>$null) | ConvertFrom-Json
+            if ($azCliAccount) {
+                $checkResults += @{
+                    message = "Azure CLI is logged in. Tenant ID: $($azCliAccount.tenantId), Subscription: $($azCliAccount.name) ($($azCliAccount.id))"
+                    result  = "Success"
+                }
+            } else {
+                $azCliInstalledButNotLoggedIn = $true
+                if ($skipAzureLoginCheck.IsPresent) {
+                    $checkResults += @{
+                        message = "Azure CLI is not logged in. Login will be prompted later."
+                        result  = "Warning"
+                    }
+                } else {
+                    $checkResults += @{
+                        message = "Azure CLI is not logged in. Please login to Azure CLI using 'az login -t `"00000000-0000-0000-0000-000000000000`"', replacing the empty GUID with your tenant ID."
+                        result  = "Failure"
+                    }
+                    $hasFailure = $true
+                }
             }
         } else {
             $checkResults += @{
-                message = "Azure CLI is not logged in. Please login to Azure CLI using 'az login -t `"00000000-0000-0000-0000-000000000000}`"', replacing the empty GUID with your tenant ID."
+                message = "Azure CLI is not installed. Follow the instructions here: https://learn.microsoft.com/en-us/cli/azure/install-azure-cli"
                 result  = "Failure"
             }
             $hasFailure = $true
@@ -268,4 +279,8 @@ function Test-Tooling {
         Write-InformationColored "Cannot continue with Deployment..." -ForegroundColor Red -InformationAction Continue
         throw "Accelerator software requirements have no been met, please review and install the missing software."
     }
+
+    return @{
+        AzCliInstalledButNotLoggedIn = $azCliInstalledButNotLoggedIn
+    }
 }

src/ALZ/Public/Deploy-Accelerator.ps1

@@ -211,26 +211,43 @@ function Deploy-Accelerator {
     }
 
     # Check software requirements first before any prompting
+    $toolingResult = $null
     if ($skip_requirements_check.IsPresent) {
         Write-InformationColored "WARNING: Skipping the software requirements check..." -ForegroundColor Yellow -InformationAction Continue
     } else {
         Write-InformationColored "Checking the software requirements for the Accelerator..." -ForegroundColor Green -InformationAction Continue
-        Test-Tooling -skipAlzModuleVersionCheck:$skip_alz_module_version_requirements_check.IsPresent -checkYamlModule:$checkYamlModule -skipYamlModuleInstall:$skip_yaml_module_install.IsPresent
+        $toolingResult = Test-Tooling -skipAlzModuleVersionCheck:$skip_alz_module_version_requirements_check.IsPresent -checkYamlModule:$checkYamlModule -skipYamlModuleInstall:$skip_yaml_module_install.IsPresent -skipAzureLoginCheck:$needsFolderStructureSetup
     }
 
-    # Query Azure for management groups and subscriptions (for interactive selection)
-    $azureContext = @{
-        ManagementGroups = @()
-        Subscriptions    = @()
-    }
+    # If az cli is installed but not logged in, prompt for tenant ID and login with device code
+    if ($needsFolderStructureSetup -and $toolingResult -and $toolingResult.AzCliInstalledButNotLoggedIn) {
+        Write-InformationColored "`nAzure CLI is installed but not logged in. Let's log you in..." -ForegroundColor Yellow -InformationAction Continue
+        Write-InformationColored "You'll need your Azure Tenant ID. You can find this in the Azure Portal under Microsoft Entra ID > Overview." -ForegroundColor Cyan -InformationAction Continue
+
+        $tenantId = ""
+        $guidRegex = "^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$"
+        do {
+            $tenantId = Read-Host "`nEnter your Azure Tenant ID (GUID)"
+            if ($tenantId -notmatch $guidRegex) {
+                Write-InformationColored "Invalid Tenant ID format. Please enter a valid GUID (e.g., 00000000-0000-0000-0000-000000000000)" -ForegroundColor Red -InformationAction Continue
+            }
+        } while ($tenantId -notmatch $guidRegex)
 
-    if ($needsFolderStructureSetup) {
-        $azureContext = Get-AzureContext
+        Write-InformationColored "`nLogging in to Azure using device code authentication..." -ForegroundColor Green -InformationAction Continue
+        Write-InformationColored "A browser window will open for you to authenticate. Follow the instructions to complete login." -ForegroundColor Cyan -InformationAction Continue
+
+        az login --use-device-code --tenant $tenantId --allow-no-subscriptions 2>&1 | Out-Null
+        if ($LASTEXITCODE -ne 0) {
+            Write-InformationColored "Azure login failed. Please try again or login manually using 'az login --tenant $tenantId'." -ForegroundColor Red -InformationAction Continue
+            throw "Azure login failed."
+        }
+
+        Write-InformationColored "Successfully logged in to Azure!" -ForegroundColor Green -InformationAction Continue
     }
 
     # If no inputs provided, prompt user for folder structure setup
     if ($needsFolderStructureSetup) {
-        $setupResult = Request-AcceleratorConfigurationInput -AzureContext $azureContext
+        $setupResult = Request-AcceleratorConfigurationInput
 
         if (-not $setupResult.Continue) {
             return