Consolidate deploy scripts and remove unused files

Makefile

@@ -142,14 +142,14 @@ terraform-deploy:
 	&& . ${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/ && ./deploy.sh
+	&& ./devops/scripts/terraform_deploy.sh ${DIR}
 
 terraform-upgrade:
 	$(call target_title, "Upgrading ${DIR} with Terraform") \
 	&& . ${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 \
-	&& ./devops/scripts/upgrade.sh ${DIR}
+	&& ./devops/scripts/terraform_upgrade_provider.sh ${DIR}
 
 terraform-import:
 	$(call target_title, "Importing ${DIR} with Terraform") \

core/terraform/deploy.sh

@@ -20,6 +20,7 @@ LOG_FILE="${TS}-tre-core.log"
 # This variables are loaded in for us
 # shellcheck disable=SC2154
 ../../devops/scripts/terraform_wrapper.sh \
+  -d "${PWD}" \
   -g "${TF_VAR_mgmt_resource_group_name}" \
   -s "${TF_VAR_mgmt_storage_account_name}" \
   -n "${TF_VAR_terraform_state_container_name}" \

core/terraform/destroy.sh

@@ -10,7 +10,8 @@ source "../../devops/scripts/kv_add_network_exception.sh"
 
 # These variables are loaded in for us
 # shellcheck disable=SC2154
-../../devops/scripts/terraform_wrapper.sh -g "${TF_VAR_mgmt_resource_group_name}" \
+../../devops/scripts/terraform_wrapper.sh -d "${PWD}" \
+                                          -g "${TF_VAR_mgmt_resource_group_name}" \
                                           -s "${TF_VAR_mgmt_storage_account_name}" \
                                           -n "${TF_VAR_terraform_state_container_name}" \
                                           -k "${TRE_ID}" -c "terraform destroy -auto-approve"

core/terraform/import.sh

@@ -10,6 +10,7 @@ export TF_LOG=""
 # This variables are loaded in for us
 # shellcheck disable=SC2154
 ../../devops/scripts/terraform_wrapper.sh \
+  -d "${PWD}" \
   -g "${TF_VAR_mgmt_resource_group_name}" \
   -s "${TF_VAR_mgmt_storage_account_name}" \
   -n "${TF_VAR_terraform_state_container_name}" \

core/version.txt

@@ -1 +1 @@
-__version__ = "0.12.5"
+__version__ = "0.12.6"

devops/scripts/terraform_deploy.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+set -e
+
+# This script is used to deploy terraform configurations
+
+# Usage: ./terraform_deploy.sh <directory>
+
+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")")")
+
+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
+
+# Call terraform_wrapper.sh to handle terraform commands
+./devops/scripts/terraform_wrapper.sh \
+    -d "$DIR/terraform" \
+    -g "${TF_VAR_mgmt_resource_group_name}" \
+    -s "${TF_VAR_mgmt_storage_account_name}" \
+    -n "${TF_VAR_terraform_state_container_name}" \
+    -k "${KEY}" \
+    -c "terraform apply -auto-approve"

devops/scripts/terraform_wrapper.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -e
 
-
 function usage() {
     cat <<USAGE
 
-    Usage: $0 [-g | --mgmt-resource-group-name ]  [-s | --mgmt-storage-account-name] [-n | --state-container-name] [-k | --key] [-c | --cmd] [-l | --logfile]
+    Usage: $0 [-d | --directory] [-g | --mgmt-resource-group-name ]  [-s | --mgmt-storage-account-name] [-n | --state-container-name] [-k | --key] [-c | --cmd] [-l | --logfile]
 
     Options:
+        -d, --directory                    Directory to change to before executing commands
         -g, --mgmt-resource-group-name      Management resource group name
         -s, --mgmt-storage-account-name     Management storage account name
         -n, --state-container-name          State container name
@@ -25,6 +25,10 @@ fi
 
 while [ "$1" != "" ]; do
     case $1 in
+    -d | --directory)
+        shift
+        DIR=$1
+        ;;
     -g | --mgmt-resource-group-name)
         shift
         mgmt_resource_group_name=$1
@@ -60,6 +64,10 @@ while [ "$1" != "" ]; do
     shift # remove the current value for `$1` and use the next
 done
 
+if [[ -z ${DIR+x} ]]; then
+    echo -e "No directory provided\n"
+    usage
+fi
 
 if [[ -z ${mgmt_resource_group_name+x} ]]; then
     echo -e "No terraform state resource group name provided\n"
@@ -91,9 +99,13 @@ if [[ -z ${tf_logfile+x} ]]; then
     echo -e "No logfile provided, using ${tf_logfile}\n"
 fi
 
+
 # shellcheck disable=SC1091
 source "$(dirname "$0")/mgmtstorage_enable_public_access.sh"
 
+# Change directory to $DIR
+pushd "$DIR" > /dev/null
+
 terraform init -input=false -backend=true -reconfigure \
     -backend-config="resource_group_name=${mgmt_resource_group_name}" \
     -backend-config="storage_account_name=${mgmt_storage_account_name}" \
@@ -130,4 +142,5 @@ do
     fi
 done
 
-
+# Return to the original directory
+popd > /dev/null

templates/shared_services/admin-vm/.dockerignore

@@ -4,5 +4,5 @@
 **/.terraform/*
 **/*_backend.tf
 Dockerfile.tmpl
-terraform/deploy.sh
+
 terraform/destroy.sh

templates/shared_services/databricks-auth/.dockerignore

@@ -4,5 +4,5 @@
 # TF backend files
 **/*_backend.tf
 Dockerfile.tmpl
-terraform/deploy.sh
+
 terraform/destroy.sh

templates/workspace_services/databricks/.dockerignore

@@ -4,5 +4,5 @@
 # TF backend files
 **/*_backend.tf
 Dockerfile.tmpl
-terraform/deploy.sh
+
 terraform/destroy.sh