From dc343a36593d519be6be425af6ade1688a7043cd Mon Sep 17 00:00:00 2001 From: Richard Cheney Date: Wed, 9 Jul 2025 12:06:17 +0100 Subject: [PATCH 1/2] Expand tilde for chdir --- .../Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 index 8d5fd1b..85b86d7 100644 --- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 +++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 @@ -23,6 +23,11 @@ function Invoke-Terraform { [switch] $silent ) + # Avoid bootstrap Terraform chdir errors if ~ in moduleFolderPath + if ($env:HOME -and $env:HOME -ne "" -and $moduleFolderPath -match '^(~)') { + $moduleFolderPath = $moduleFolderPath -replace '^(~)', $env:HOME + } + if ($PSCmdlet.ShouldProcess("Apply Terraform", "modify")) { # Check and Set Subscription ID $removeSubscriptionId = $false From 622c89f1ffea2cd53a0e3ffdf03e273bdba0f324 Mon Sep 17 00:00:00 2001 From: Richard Cheney Date: Wed, 9 Jul 2025 13:45:36 +0100 Subject: [PATCH 2/2] Switch to Resolve-Path for cross-platform --- .../Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 index 85b86d7..6ef5c9e 100644 --- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 +++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 @@ -23,10 +23,8 @@ function Invoke-Terraform { [switch] $silent ) - # Avoid bootstrap Terraform chdir errors if ~ in moduleFolderPath - if ($env:HOME -and $env:HOME -ne "" -and $moduleFolderPath -match '^(~)') { - $moduleFolderPath = $moduleFolderPath -replace '^(~)', $env:HOME - } + # Resolve to absolute path for `terraform -chdir` switch + $moduleFolderPath = (Resolve-Path $moduleFolderPath).Path if ($PSCmdlet.ShouldProcess("Apply Terraform", "modify")) { # Check and Set Subscription ID