From 55ed202463404e798212243b7c07f0ce81ca358e Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 19 Feb 2025 15:26:00 +0000 Subject: [PATCH 1/3] Consolidate deploy.sh --- Makefile | 4 +- core/terraform/deploy.sh | 1 + core/terraform/destroy.sh | 3 +- core/terraform/import.sh | 1 + devops/scripts/terraform_deploy.sh | 63 +++++++++++++++++++ ...grade.sh => terraform_upgrade_provider.sh} | 0 devops/scripts/terraform_wrapper.sh | 20 ++++-- .../shared_services/admin-vm/.dockerignore | 2 +- .../admin-vm/terraform/deploy.sh | 20 ------ .../airlock_notifier/terraform/deploy.sh | 15 ----- .../cyclecloud/terraform/deploy.sh | 12 ---- .../databricks-auth/.dockerignore | 2 +- .../databricks-auth/terraform/deploy.sh | 22 ------- .../shared_services/deploy_from_local.sh | 22 ------- .../shared_services/gitea/terraform/deploy.sh | 20 ------ .../sonatype-nexus-vm/terraform/deploy.sh | 10 --- .../azureml/terraform/deploy.sh | 15 ----- .../azureml/terraform/upgrade.sh | 13 ---- .../aml_compute/terraform/deploy.sh | 14 ----- .../aml_compute/terraform/upgrade.sh | 13 ---- .../azuresql/terraform/upgrade.sh | 13 ---- .../databricks/.dockerignore | 2 +- .../databricks/terraform/deploy.sh | 22 ------- .../workspace_services/gitea/.dockerignore | 2 +- .../gitea/terraform/deploy.sh | 21 ------- .../guacamole/.dockerignore | 2 +- .../guacamole/terraform/deploy.sh | 14 ----- .../.dockerignore | 2 +- .../terraform/deploy.sh | 18 ------ .../.dockerignore | 2 +- .../terraform/deploy.sh | 18 ------ .../guacamole-azure-linuxvm/.dockerignore | 2 +- .../terraform/deploy.sh | 18 ------ .../guacamole-azure-windowsvm/.dockerignore | 2 +- .../terraform/deploy.sh | 18 ------ .../mysql/terraform/upgrade.sh | 13 ---- .../ohdsi/terraform/deploy.sh | 14 ----- .../ohdsi/terraform/upgrade.sh | 13 ---- .../openai/terraform/upgrade.sh | 13 ---- .../airlock-import-review/.dockerignore | 2 +- templates/workspaces/base/.dockerignore | 2 +- templates/workspaces/base/terraform/deploy.sh | 15 ----- .../workspaces/base/terraform/upgrade.sh | 13 ---- .../workspaces/unrestricted/.dockerignore | 2 +- 44 files changed, 97 insertions(+), 418 deletions(-) create mode 100755 devops/scripts/terraform_deploy.sh rename devops/scripts/{upgrade.sh => terraform_upgrade_provider.sh} (100%) delete mode 100755 templates/shared_services/admin-vm/terraform/deploy.sh delete mode 100755 templates/shared_services/airlock_notifier/terraform/deploy.sh delete mode 100755 templates/shared_services/cyclecloud/terraform/deploy.sh delete mode 100755 templates/shared_services/databricks-auth/terraform/deploy.sh delete mode 100755 templates/shared_services/deploy_from_local.sh delete mode 100755 templates/shared_services/gitea/terraform/deploy.sh delete mode 100755 templates/shared_services/sonatype-nexus-vm/terraform/deploy.sh delete mode 100755 templates/workspace_services/azureml/terraform/deploy.sh delete mode 100644 templates/workspace_services/azureml/terraform/upgrade.sh delete mode 100755 templates/workspace_services/azureml/user_resources/aml_compute/terraform/deploy.sh delete mode 100644 templates/workspace_services/azureml/user_resources/aml_compute/terraform/upgrade.sh delete mode 100644 templates/workspace_services/azuresql/terraform/upgrade.sh delete mode 100755 templates/workspace_services/databricks/terraform/deploy.sh delete mode 100755 templates/workspace_services/gitea/terraform/deploy.sh delete mode 100755 templates/workspace_services/guacamole/terraform/deploy.sh delete mode 100755 templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/deploy.sh delete mode 100755 templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/deploy.sh delete mode 100755 templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/deploy.sh delete mode 100755 templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/deploy.sh delete mode 100644 templates/workspace_services/mysql/terraform/upgrade.sh delete mode 100644 templates/workspace_services/ohdsi/terraform/deploy.sh delete mode 100644 templates/workspace_services/ohdsi/terraform/upgrade.sh delete mode 100644 templates/workspace_services/openai/terraform/upgrade.sh delete mode 100755 templates/workspaces/base/terraform/deploy.sh delete mode 100644 templates/workspaces/base/terraform/upgrade.sh diff --git a/Makefile b/Makefile index b879490f3b..76f61f2084 100644 --- a/Makefile +++ b/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") \ diff --git a/core/terraform/deploy.sh b/core/terraform/deploy.sh index ef547a8aa7..e6e87c4068 100755 --- a/core/terraform/deploy.sh +++ b/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}" \ diff --git a/core/terraform/destroy.sh b/core/terraform/destroy.sh index 7c8506beef..9442c412dd 100755 --- a/core/terraform/destroy.sh +++ b/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" diff --git a/core/terraform/import.sh b/core/terraform/import.sh index b9cc6feee2..72bcb27b13 100755 --- a/core/terraform/import.sh +++ b/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}" \ diff --git a/devops/scripts/terraform_deploy.sh b/devops/scripts/terraform_deploy.sh new file mode 100755 index 0000000000..8c942c321a --- /dev/null +++ b/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 + +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" diff --git a/devops/scripts/upgrade.sh b/devops/scripts/terraform_upgrade_provider.sh similarity index 100% rename from devops/scripts/upgrade.sh rename to devops/scripts/terraform_upgrade_provider.sh diff --git a/devops/scripts/terraform_wrapper.sh b/devops/scripts/terraform_wrapper.sh index 6f8c66a0d1..55cb7870f2 100755 --- a/devops/scripts/terraform_wrapper.sh +++ b/devops/scripts/terraform_wrapper.sh @@ -1,16 +1,16 @@ #!/bin/bash set -e - function usage() { cat < /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}" \ @@ -127,4 +138,5 @@ do fi done - +# Return to the original directory +popd > /dev/null diff --git a/templates/shared_services/admin-vm/.dockerignore b/templates/shared_services/admin-vm/.dockerignore index c3bd260c59..f2906b3a26 100644 --- a/templates/shared_services/admin-vm/.dockerignore +++ b/templates/shared_services/admin-vm/.dockerignore @@ -4,5 +4,5 @@ **/.terraform/* **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/shared_services/admin-vm/terraform/deploy.sh b/templates/shared_services/admin-vm/terraform/deploy.sh deleted file mode 100755 index 08a52b7119..0000000000 --- a/templates/shared_services/admin-vm/terraform/deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" - -# This script assumes you have created an .env from the sample and the variables -# will come from there. -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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}-adminvm" -terraform plan -terraform apply -auto-approve diff --git a/templates/shared_services/airlock_notifier/terraform/deploy.sh b/templates/shared_services/airlock_notifier/terraform/deploy.sh deleted file mode 100755 index 7fb67ab8ac..0000000000 --- a/templates/shared_services/airlock_notifier/terraform/deploy.sh +++ /dev/null @@ -1,15 +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 -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" - -terraform apply -auto-approve diff --git a/templates/shared_services/cyclecloud/terraform/deploy.sh b/templates/shared_services/cyclecloud/terraform/deploy.sh deleted file mode 100755 index c213ede101..0000000000 --- a/templates/shared_services/cyclecloud/terraform/deploy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e - -export TF_LOG="" - -terraform init -input=false -backend=true -reconfigure \ - -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}-${ID}" -terraform plan -terraform apply -auto-approve diff --git a/templates/shared_services/databricks-auth/.dockerignore b/templates/shared_services/databricks-auth/.dockerignore index c1234b68e6..077a23c8f4 100644 --- a/templates/shared_services/databricks-auth/.dockerignore +++ b/templates/shared_services/databricks-auth/.dockerignore @@ -4,5 +4,5 @@ # TF backend files **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/shared_services/databricks-auth/terraform/deploy.sh b/templates/shared_services/databricks-auth/terraform/deploy.sh deleted file mode 100755 index c18883746e..0000000000 --- a/templates/shared_services/databricks-auth/terraform/deploy.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset - -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -#set -o xtrace - -export TF_LOG="TRACE" -export TF_LOG_PATH="/home/adminuser/tf.log" - -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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}" - -terraform plan - -terraform apply -auto-approve diff --git a/templates/shared_services/deploy_from_local.sh b/templates/shared_services/deploy_from_local.sh deleted file mode 100755 index 844c20be62..0000000000 --- a/templates/shared_services/deploy_from_local.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# This script exists to support the migration from the firewall into a shared service bundle, that can be deployed from a dev workstation. - -set -e - -PLAN_FILE="tfplan$$" -TS=$(date +"%s") -LOG_FILE="${TS}-tre-${SHARED_SERVICE_KEY}.log" - -LOC="$(dirname -- "$(readlink -f "${BASH_SOURCE}")")" - -${LOC}/../../devops/scripts/terraform_wrapper.sh \ - -g $TF_VAR_mgmt_resource_group_name \ - -s $TF_VAR_mgmt_storage_account_name \ - -n $TF_VAR_terraform_state_container_name \ - -k ${TRE_ID}-${SHARED_SERVICE_KEY} \ - -l ${LOG_FILE} \ - -c "terraform plan -out ${PLAN_FILE} && \ - terraform apply -input=false -auto-approve ${PLAN_FILE} && \ - terraform output -json > ../tre_output.json" - diff --git a/templates/shared_services/gitea/terraform/deploy.sh b/templates/shared_services/gitea/terraform/deploy.sh deleted file mode 100755 index 3559959fca..0000000000 --- a/templates/shared_services/gitea/terraform/deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" - -# This script assumes you have created an .env from the sample and the variables -# will come from there. -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/deploy.sh b/templates/shared_services/sonatype-nexus-vm/terraform/deploy.sh deleted file mode 100755 index 2a371d27e3..0000000000 --- a/templates/shared_services/sonatype-nexus-vm/terraform/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -export TF_LOG="" - -terraform init -input=false -backend=true -reconfigure -upgrade \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/azureml/terraform/deploy.sh b/templates/workspace_services/azureml/terraform/deploy.sh deleted file mode 100755 index 61f1798508..0000000000 --- a/templates/workspace_services/azureml/terraform/deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -o errexit -set -o pipefail -set -o nounset - -export TF_LOG="" - -terraform init -input=false -backend=true -reconfigure -upgrade \ - -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_id?}azureml" - -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/azureml/terraform/upgrade.sh b/templates/workspace_services/azureml/terraform/upgrade.sh deleted file mode 100644 index 65dd6f75dd..0000000000 --- a/templates/workspace_services/azureml/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?}_azureml" diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/terraform/deploy.sh b/templates/workspace_services/azureml/user_resources/aml_compute/terraform/deploy.sh deleted file mode 100755 index 27672801d5..0000000000 --- a/templates/workspace_services/azureml/user_resources/aml_compute/terraform/deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -o errexit -set -o pipefail -set -o nounset - -export TF_LOG="" - -terraform init -input=false -backend=true -reconfigure \ - -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-user-resource-aml-compute-instance-${TF_VAR_id?}" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/terraform/upgrade.sh b/templates/workspace_services/azureml/user_resources/aml_compute/terraform/upgrade.sh deleted file mode 100644 index bc6c8cb219..0000000000 --- a/templates/workspace_services/azureml/user_resources/aml_compute/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-user-resource-aml-compute-instance" diff --git a/templates/workspace_services/azuresql/terraform/upgrade.sh b/templates/workspace_services/azuresql/terraform/upgrade.sh deleted file mode 100644 index d694a0fd3e..0000000000 --- a/templates/workspace_services/azuresql/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-azuresql" diff --git a/templates/workspace_services/databricks/.dockerignore b/templates/workspace_services/databricks/.dockerignore index c1234b68e6..077a23c8f4 100644 --- a/templates/workspace_services/databricks/.dockerignore +++ b/templates/workspace_services/databricks/.dockerignore @@ -4,5 +4,5 @@ # TF backend files **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspace_services/databricks/terraform/deploy.sh b/templates/workspace_services/databricks/terraform/deploy.sh deleted file mode 100755 index c18883746e..0000000000 --- a/templates/workspace_services/databricks/terraform/deploy.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset - -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -#set -o xtrace - -export TF_LOG="TRACE" -export TF_LOG_PATH="/home/adminuser/tf.log" - -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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}" - -terraform plan - -terraform apply -auto-approve diff --git a/templates/workspace_services/gitea/.dockerignore b/templates/workspace_services/gitea/.dockerignore index f3d6416e3f..429526e706 100644 --- a/templates/workspace_services/gitea/.dockerignore +++ b/templates/workspace_services/gitea/.dockerignore @@ -2,7 +2,7 @@ # Put files here that you don't want copied into your bundle's invocation image .gitignore Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh # Local .terraform directories diff --git a/templates/workspace_services/gitea/terraform/deploy.sh b/templates/workspace_services/gitea/terraform/deploy.sh deleted file mode 100755 index 0d9d3cc915..0000000000 --- a/templates/workspace_services/gitea/terraform/deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" - -# This script assumes you have created an .env from the sample and the variables -# will come from there. -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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}" - -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/guacamole/.dockerignore b/templates/workspace_services/guacamole/.dockerignore index 910c395f3e..df673ed967 100644 --- a/templates/workspace_services/guacamole/.dockerignore +++ b/templates/workspace_services/guacamole/.dockerignore @@ -7,7 +7,7 @@ Dockerfile.tmpl .env* -terraform/deploy.sh + terraform/destroy.sh guacamole-server/ !guacamole-server/docker/version.txt diff --git a/templates/workspace_services/guacamole/terraform/deploy.sh b/templates/workspace_services/guacamole/terraform/deploy.sh deleted file mode 100755 index 714457f8ec..0000000000 --- a/templates/workspace_services/guacamole/terraform/deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -export TF_LOG="" -# This script assumes you have created an .env from the sample and the variables -# will come from there. -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/.dockerignore b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/.dockerignore index c25ad2e1df..56c4fc87e5 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/.dockerignore +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/.dockerignore @@ -10,5 +10,5 @@ Dockerfile.tmpl .env* -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/deploy.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/deploy.sh deleted file mode 100755 index f73f31d6b3..0000000000 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/terraform/deploy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" -# This variables are loaded in for us -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/.dockerignore b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/.dockerignore index 28756cfe84..f539fd09f5 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/.dockerignore +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/.dockerignore @@ -7,5 +7,5 @@ Dockerfile.tmpl .env* -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/deploy.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/deploy.sh deleted file mode 100755 index f73f31d6b3..0000000000 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/terraform/deploy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" -# This variables are loaded in for us -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/.dockerignore b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/.dockerignore index 28756cfe84..f539fd09f5 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/.dockerignore +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/.dockerignore @@ -7,5 +7,5 @@ Dockerfile.tmpl .env* -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/deploy.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/deploy.sh deleted file mode 100755 index 78aff6f3fd..0000000000 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/deploy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" -# These variables are loaded in for us -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure -upgrade \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/.dockerignore b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/.dockerignore index 28756cfe84..f539fd09f5 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/.dockerignore +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/.dockerignore @@ -7,5 +7,5 @@ Dockerfile.tmpl .env* -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/deploy.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/deploy.sh deleted file mode 100755 index f73f31d6b3..0000000000 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/deploy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -set -o nounset -# Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace - -export TF_LOG="" -# This variables are loaded in for us -# shellcheck disable=SC2154 -terraform init -input=false -backend=true -reconfigure \ - -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" -terraform plan -terraform apply -auto-approve diff --git a/templates/workspace_services/mysql/terraform/upgrade.sh b/templates/workspace_services/mysql/terraform/upgrade.sh deleted file mode 100644 index baae96d5e8..0000000000 --- a/templates/workspace_services/mysql/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}-mysql" diff --git a/templates/workspace_services/ohdsi/terraform/deploy.sh b/templates/workspace_services/ohdsi/terraform/deploy.sh deleted file mode 100644 index 6bbf241f26..0000000000 --- a/templates/workspace_services/ohdsi/terraform/deploy.sh +++ /dev/null @@ -1,14 +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 -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-ohdsi-${TF_VAR_tre_resource_id}" -terraform apply -auto-approve diff --git a/templates/workspace_services/ohdsi/terraform/upgrade.sh b/templates/workspace_services/ohdsi/terraform/upgrade.sh deleted file mode 100644 index 1d65e728d8..0000000000 --- a/templates/workspace_services/ohdsi/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-ohdsi-${TF_VAR_tre_resource_id}" diff --git a/templates/workspace_services/openai/terraform/upgrade.sh b/templates/workspace_services/openai/terraform/upgrade.sh deleted file mode 100644 index 576c6764a9..0000000000 --- a/templates/workspace_services/openai/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-openai-${TF_VAR_tre_resource_id}" diff --git a/templates/workspaces/airlock-import-review/.dockerignore b/templates/workspaces/airlock-import-review/.dockerignore index e2b7cb2a0e..acaaee367b 100644 --- a/templates/workspaces/airlock-import-review/.dockerignore +++ b/templates/workspaces/airlock-import-review/.dockerignore @@ -5,5 +5,5 @@ **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspaces/base/.dockerignore b/templates/workspaces/base/.dockerignore index e2b7cb2a0e..acaaee367b 100644 --- a/templates/workspaces/base/.dockerignore +++ b/templates/workspaces/base/.dockerignore @@ -5,5 +5,5 @@ **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh diff --git a/templates/workspaces/base/terraform/deploy.sh b/templates/workspaces/base/terraform/deploy.sh deleted file mode 100755 index df5663e9e5..0000000000 --- a/templates/workspaces/base/terraform/deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -# This script is not used and is left here for you to debug the creation of the workspace -# at a Terraform level 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 -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}-ws-${TF_VAR_tre_resource_id}" -terraform apply -auto-approve diff --git a/templates/workspaces/base/terraform/upgrade.sh b/templates/workspaces/base/terraform/upgrade.sh deleted file mode 100644 index d6fbd13c9e..0000000000 --- a/templates/workspaces/base/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}-ws-${TF_VAR_tre_resource_id}" diff --git a/templates/workspaces/unrestricted/.dockerignore b/templates/workspaces/unrestricted/.dockerignore index e2b7cb2a0e..acaaee367b 100644 --- a/templates/workspaces/unrestricted/.dockerignore +++ b/templates/workspaces/unrestricted/.dockerignore @@ -5,5 +5,5 @@ **/*_backend.tf Dockerfile.tmpl -terraform/deploy.sh + terraform/destroy.sh From b93e65966ed26ffbfd2ad1634dd4e88d5f49179e Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 19 Feb 2025 15:41:40 +0000 Subject: [PATCH 2/3] update version --- core/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version.txt b/core/version.txt index 8e1395bd35..6dd4954d0d 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.12.3" +__version__ = "0.12.4" From 10f071379ab3f8ec05d016fa351b99c4de841ac2 Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Thu, 27 Feb 2025 11:13:27 +0000 Subject: [PATCH 3/3] Update devops/scripts/terraform_wrapper.sh --- devops/scripts/terraform_wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/scripts/terraform_wrapper.sh b/devops/scripts/terraform_wrapper.sh index bd0e0bc547..b07ed591cd 100755 --- a/devops/scripts/terraform_wrapper.sh +++ b/devops/scripts/terraform_wrapper.sh @@ -10,7 +10,7 @@ function usage() { -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 + -n, --state-container-name State container name -k, --key Key -c, --cmd Command to execute -l, --logfile Log file to write output to