From dea7921e6523676509a808cb28998ba5b8e8d0f8 Mon Sep 17 00:00:00 2001
From: Marcus Robinson <marrobi@microsoft.com>
Date: Thu, 7 Nov 2024 12:47:49 +0000
Subject: [PATCH 1/5] consolidate-upgrade-scripts

---
 Makefile                                      |  2 +-
 core/terraform/upgrade.sh                     | 13 -------
 devops/scripts/upgrade.sh                     | 36 +++++++++++++++++++
 devops/terraform/upgrade.sh                   | 13 -------
 .../admin-vm/terraform/upgrade.sh             | 13 -------
 .../airlock_notifier/terraform/upgrade.sh     | 13 -------
 .../certs/terraform/upgrade.sh                | 13 -------
 .../cyclecloud/terraform/upgrade.sh           | 13 -------
 .../databricks-auth/terraform/upgrade.sh      | 13 -------
 .../firewall/terraform/upgrade.sh             | 13 -------
 .../gitea/terraform/upgrade.sh                | 13 -------
 .../sonatype-nexus-vm/terraform/upgrade.sh    | 13 -------
 .../databricks/terraform/upgrade.sh           | 13 -------
 .../gitea/terraform/upgrade.sh                | 13 -------
 .../guacamole/terraform/upgrade.sh            | 13 -------
 .../terraform/upgrade.sh                      | 13 -------
 .../terraform/upgrade.sh                      | 13 -------
 .../terraform/upgrade.sh                      | 13 -------
 .../terraform/upgrade.sh                      | 13 -------
 19 files changed, 37 insertions(+), 222 deletions(-)
 delete mode 100644 core/terraform/upgrade.sh
 create mode 100644 devops/scripts/upgrade.sh
 delete mode 100644 devops/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/admin-vm/terraform/upgrade.sh
 delete mode 100755 templates/shared_services/airlock_notifier/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/certs/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/cyclecloud/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/databricks-auth/terraform/upgrade.sh
 delete mode 100755 templates/shared_services/firewall/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/gitea/terraform/upgrade.sh
 delete mode 100644 templates/shared_services/sonatype-nexus-vm/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/databricks/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/gitea/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/guacamole/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/upgrade.sh
 delete mode 100644 templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/upgrade.sh

diff --git a/Makefile b/Makefile
index 4053dc3f9a..13ea72f41f 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ terraform-upgrade:
 	&& . ${MAKEFILE_DIR}/devops/scripts/check_dependencies.sh env \
 	&& . ${MAKEFILE_DIR}/devops/scripts/load_and_validate_env.sh \
 	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${DIR}/.env \
-	&& cd ${DIR}/terraform/ && ./upgrade.sh
+	&& ./devops/scripts/upgrade.sh ${DIR}
 
 terraform-import:
 	$(call target_title, "Importing ${DIR} with Terraform") \
diff --git a/core/terraform/upgrade.sh b/core/terraform/upgrade.sh
deleted file mode 100644
index 861e28d2f1..0000000000
--- a/core/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_resource_id}-core"
diff --git a/devops/scripts/upgrade.sh b/devops/scripts/upgrade.sh
new file mode 100644
index 0000000000..8fae97b144
--- /dev/null
+++ b/devops/scripts/upgrade.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+# This script is used to upgrade terraform providers in a specified directory
+
+# Usage: ./upgrade.sh <directory>
+
+DIR=$1
+
+# Load environment variables from .env file
+if [ -f "$DIR/.env" ]; then
+  set -a
+  . "$DIR/.env"
+  set +a
+fi
+
+# Infer the key from the directory names
+PARENT_DIR=$(basename "$(dirname "$DIR")")
+GRANDPARENT_DIR=$(basename "$(dirname "$(dirname "$DIR")")")
+
+if [[ "$GRANDPARENT_DIR" == "workspaces" || "$GRANDPARENT_DIR" == "shared_services" ]]; then
+  KEY="${TRE_ID?}_${TF_VAR_id?}_${PARENT_DIR}"
+elif [[ "$GRANDPARENT_DIR" == "workspace_services" ]]; then
+  KEY="${TRE_ID?}_${TF_VAR_workspace_id?}_${TF_VAR_id?}_${PARENT_DIR}"
+elif [[ "$GRANDPARENT_DIR" == "user_resources" ]]; then
+  KEY="${TRE_ID?}_${TF_VAR_workspace_id?}_${TF_VAR_workspace_service_id?}_${TF_VAR_id?}_${PARENT_DIR}"
+else
+  KEY="${TRE_ID?}_${PARENT_DIR}"
+fi
+
+# Run terraform init with upgrade and reconfigure options
+terraform -chdir="$DIR/terraform" init -upgrade -reconfigure -input=false -backend=true \
+    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
+    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
+    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
+    -backend-config="key=${KEY}"
diff --git a/devops/terraform/upgrade.sh b/devops/terraform/upgrade.sh
deleted file mode 100644
index a05032d544..0000000000
--- a/devops/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_resource_id}-devops"
diff --git a/templates/shared_services/admin-vm/terraform/upgrade.sh b/templates/shared_services/admin-vm/terraform/upgrade.sh
deleted file mode 100644
index 12597ee325..0000000000
--- a/templates/shared_services/admin-vm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_resource_id}-shared-adminvm"
diff --git a/templates/shared_services/airlock_notifier/terraform/upgrade.sh b/templates/shared_services/airlock_notifier/terraform/upgrade.sh
deleted file mode 100755
index 72785516f5..0000000000
--- a/templates/shared_services/airlock_notifier/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_resource_id}-shared-airlock-notifier"
diff --git a/templates/shared_services/certs/terraform/upgrade.sh b/templates/shared_services/certs/terraform/upgrade.sh
deleted file mode 100644
index aae4c58cef..0000000000
--- a/templates/shared_services/certs/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}-certs"
diff --git a/templates/shared_services/cyclecloud/terraform/upgrade.sh b/templates/shared_services/cyclecloud/terraform/upgrade.sh
deleted file mode 100644
index 5368cb1a55..0000000000
--- a/templates/shared_services/cyclecloud/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_resource_id}-${ID}"
diff --git a/templates/shared_services/databricks-auth/terraform/upgrade.sh b/templates/shared_services/databricks-auth/terraform/upgrade.sh
deleted file mode 100644
index 70b3863871..0000000000
--- a/templates/shared_services/databricks-auth/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=tre-workspace-service-gitea-${TF_VAR_id}"
diff --git a/templates/shared_services/firewall/terraform/upgrade.sh b/templates/shared_services/firewall/terraform/upgrade.sh
deleted file mode 100755
index d690d433a7..0000000000
--- a/templates/shared_services/firewall/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}-shared-service-firewall"
diff --git a/templates/shared_services/gitea/terraform/upgrade.sh b/templates/shared_services/gitea/terraform/upgrade.sh
deleted file mode 100644
index 6618fcb445..0000000000
--- a/templates/shared_services/gitea/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}-gitea"
diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/upgrade.sh b/templates/shared_services/sonatype-nexus-vm/terraform/upgrade.sh
deleted file mode 100644
index f15b4a2ee6..0000000000
--- a/templates/shared_services/sonatype-nexus-vm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID:?}-shared-service-sonatype-nexus"
diff --git a/templates/workspace_services/databricks/terraform/upgrade.sh b/templates/workspace_services/databricks/terraform/upgrade.sh
deleted file mode 100644
index 70b3863871..0000000000
--- a/templates/workspace_services/databricks/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=tre-workspace-service-gitea-${TF_VAR_id}"
diff --git a/templates/workspace_services/gitea/terraform/upgrade.sh b/templates/workspace_services/gitea/terraform/upgrade.sh
deleted file mode 100644
index 70b3863871..0000000000
--- a/templates/workspace_services/gitea/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=tre-workspace-service-gitea-${TF_VAR_id}"
diff --git a/templates/workspace_services/guacamole/terraform/upgrade.sh b/templates/workspace_services/guacamole/terraform/upgrade.sh
deleted file mode 100644
index edf24afb36..0000000000
--- a/templates/workspace_services/guacamole/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}${TF_VAR_workspace_id}guacamole"
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/upgrade.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/upgrade.sh
deleted file mode 100644
index e5bbe41a91..0000000000
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}${TF_VAR_workspace_id}${TF_VAR_parent_service_id}guacamolewindowsvm"
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/upgrade.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/upgrade.sh
deleted file mode 100644
index e5bbe41a91..0000000000
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}${TF_VAR_workspace_id}${TF_VAR_parent_service_id}guacamolewindowsvm"
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/upgrade.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/upgrade.sh
deleted file mode 100644
index f6d9bbcefe..0000000000
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TF_VAR_tre_id}${TF_VAR_workspace_id}${TF_VAR_parent_service_id}guacamolelinuxvm"
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/upgrade.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/upgrade.sh
deleted file mode 100644
index e5bbe41a91..0000000000
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/upgrade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script is used to install the bundle directly without having to interact with Porter
-
-# This script assumes you have created an .env from the sample and the variables
-# will come from there.
-# shellcheck disable=SC2154
-terraform init -upgrade -reconfigure -input=false -backend=true \
-    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
-    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
-    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
-    -backend-config="key=${TRE_ID}${TF_VAR_workspace_id}${TF_VAR_parent_service_id}guacamolewindowsvm"

From a1773d0da51cf76d86db18f7bdb94082b3f7fbc6 Mon Sep 17 00:00:00 2001
From: Marcus Robinson <marrobi@microsoft.com>
Date: Thu, 7 Nov 2024 12:58:51 +0000
Subject: [PATCH 2/5] Fix linting.

---
 devops/scripts/upgrade.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 mode change 100644 => 100755 devops/scripts/upgrade.sh

diff --git a/devops/scripts/upgrade.sh b/devops/scripts/upgrade.sh
old mode 100644
new mode 100755
index 8fae97b144..89733492f7
--- a/devops/scripts/upgrade.sh
+++ b/devops/scripts/upgrade.sh
@@ -10,10 +10,35 @@ DIR=$1
 # Load environment variables from .env file
 if [ -f "$DIR/.env" ]; then
   set -a
+  # shellcheck source=/dev/null
   . "$DIR/.env"
   set +a
 fi
 
+# Ensure TF_VAR_mgmt_resource_group_name is set
+if [ -z "${TF_VAR_mgmt_resource_group_name}" ]; then
+  echo "Error: TF_VAR_mgmt_resource_group_name is not set."
+  exit 1
+fi
+
+# Ensure TF_VAR_mgmt_storage_account_name is set
+if [ -z "${TF_VAR_mgmt_storage_account_name}" ]; then
+  echo "Error: TF_VAR_mgmt_storage_account_name is not set."
+  exit 1
+fi
+
+# Ensure TF_VAR_terraform_state_container_name is set
+if [ -z "${TF_VAR_terraform_state_container_name}" ]; then
+  echo "Error: TF_VAR_terraform_state_container_name is not set."
+  exit 1
+fi
+
+# Ensure TRE_ID is set
+if [ -z "${TRE_ID}" ]; then
+  echo "Error: TRE_ID is not set."
+  exit 1
+fi
+
 # Infer the key from the directory names
 PARENT_DIR=$(basename "$(dirname "$DIR")")
 GRANDPARENT_DIR=$(basename "$(dirname "$(dirname "$DIR")")")

From 12358a0308bc8022bcb455076153e55880e1e7aa Mon Sep 17 00:00:00 2001
From: Marcus Robinson <marrobi@microsoft.com>
Date: Thu, 7 Nov 2024 13:00:37 +0000
Subject: [PATCH 3/5] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4898f1f5ee..be10c79b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@
 FEATURES:
 
 ENHANCEMENTS:
-* Split log entries with [Log chunk X of Y] for better readability. ([[#3992](https://github.com/microsoft/AzureTRE/issues/3992)
+* Split log entries with [Log chunk X of Y] for better readability. ([#3992](https://github.com/microsoft/AzureTRE/issues/3992))
 * Expose APP_SERVICE_SKU build variable to allow enablement of App Gateway WAF ([#4111](https://github.com/microsoft/AzureTRE/pull/4111))
 * Update Terraform to use Azure AD authentication rather than storage account keys ([#4103](https://github.com/microsoft/AzureTRE/issues/4103))
+* Consolidate Terraform upgrade scripts ([#4099](https://github.com/microsoft/AzureTRE/issues/4099))
 
 BUG FIXES:
 - Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112))

From 3c3cdfa2d4a0b51d48a827cfb56fe4973f0f8415 Mon Sep 17 00:00:00 2001
From: Marcus Robinson <marrobi@microsoft.com>
Date: Thu, 7 Nov 2024 13:08:49 +0000
Subject: [PATCH 4/5] Increase version

---
 core/version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version.txt b/core/version.txt
index a37fec72b0..f63b48ab36 100644
--- a/core/version.txt
+++ b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.10.12"
+__version__ = "0.10.13"

From d630d4eb706ab0097eaf558f252282b47f1afd49 Mon Sep 17 00:00:00 2001
From: Marcus Robinson <marrobi@microsoft.com>
Date: Tue, 7 Jan 2025 08:50:40 +0000
Subject: [PATCH 5/5] Fix workflows.

---
 .github/workflows/build_validation_develop.yml | 5 +++++
 .github/workflows/codeql-analysis.yml          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_validation_develop.yml b/.github/workflows/build_validation_develop.yml
index c44cba4b9d..01be02c3c0 100644
--- a/.github/workflows/build_validation_develop.yml
+++ b/.github/workflows/build_validation_develop.yml
@@ -52,6 +52,11 @@ jobs:
             terraform_workspace_services:
               - templates/workspace_services/**/terraform/**/*.tf
 
+      - uses: hashicorp/setup-terraform@v3
+        if: ${{ steps.filter.outputs.terraform == 'true' }}
+        with:
+          terraform_version: "1.9.8"
+
       - name: Terraform format check
         if: ${{ steps.filter.outputs.terraform == 'true' }}
         run: terraform fmt -check -recursive
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 176b3b6a39..2cb40d1fd9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read