From df25930eb00bd682ed0baf8133d3d6c7b4ebfd2a Mon Sep 17 00:00:00 2001
From: Jared Holgate <jaredholgate@microsoft.com>
Date: Sun, 19 Jan 2025 18:03:06 +0000
Subject: [PATCH 1/4] feat: support azurerm v4

---
 .../Deploy-Accelerator-Helpers/Invoke-Terraform.ps1  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
index ba7b31ce..cb1a3939 100644
--- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
+++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
@@ -24,6 +24,18 @@ function Invoke-Terraform {
     )
 
     if ($PSCmdlet.ShouldProcess("Apply Terraform", "modify")) {
+        # Check and Set Subscription ID
+        if($null -eq $env:ARM_SUBSCRIPTION_ID) {
+            Write-Verbose "Setting environment variable ARM_SUBSCRIPTION_ID"
+            $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."
+                return
+            }
+            $env:ARM_SUBSCRIPTION_ID = $subscriptionId
+            Write-Verbose "Environment variable ARM_SUBSCRIPTION_ID set to $subscriptionId"
+        }
+
         terraform -chdir="$moduleFolderPath" init
         $action = "apply"
         if($destroy) {

From 54a575ea07f57638381a7d8ba04b76ecff9f3f79 Mon Sep 17 00:00:00 2001
From: Jared Holgate <jaredholgate@microsoft.com>
Date: Sun, 19 Jan 2025 18:03:38 +0000
Subject: [PATCH 2/4] Update message

---
 src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
index cb1a3939..0c23ecd7 100644
--- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
+++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
@@ -29,7 +29,7 @@ function Invoke-Terraform {
             Write-Verbose "Setting environment variable ARM_SUBSCRIPTION_ID"
             $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."
+                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."
                 return
             }
             $env:ARM_SUBSCRIPTION_ID = $subscriptionId

From d819badccff6df05a8f4caa0f02237c7865f14d3 Mon Sep 17 00:00:00 2001
From: Jared Holgate <jaredholgate@microsoft.com>
Date: Sun, 19 Jan 2025 18:03:50 +0000
Subject: [PATCH 3/4] Fix message

---
 src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
index 0c23ecd7..bffa3062 100644
--- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
+++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
@@ -29,7 +29,7 @@ function Invoke-Terraform {
             Write-Verbose "Setting environment variable ARM_SUBSCRIPTION_ID"
             $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. Use 'az account show' to check."
                 return
             }
             $env:ARM_SUBSCRIPTION_ID = $subscriptionId

From 83c60b18911cf02da4baabb1ed5baf63dc2d7b59 Mon Sep 17 00:00:00 2001
From: Jared Holgate <jaredholgate@microsoft.com>
Date: Sun, 19 Jan 2025 18:04:06 +0000
Subject: [PATCH 4/4] Add extra check

---
 src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1 b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
index bffa3062..3c16a9b3 100644
--- a/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
+++ b/src/ALZ/Private/Deploy-Accelerator-Helpers/Invoke-Terraform.ps1
@@ -25,7 +25,7 @@ function Invoke-Terraform {
 
     if ($PSCmdlet.ShouldProcess("Apply Terraform", "modify")) {
         # Check and Set Subscription ID
-        if($null -eq $env:ARM_SUBSCRIPTION_ID) {
+        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)
             if($null -eq $subscriptionId -or $subscriptionId -eq "") {