upgrade our user resources

OxBRCInformatics · Sep 26, 2024 · 8edbd99 · 8edbd99
1 parent f7d3c99
commit 8edbd99
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 33 deletions.
diff --git a/...ates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml b/...ates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm-ouh2
-version: 1.0.0
+version: 1.0.1
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...vices/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/.terraform.lock.hcl b/...vices/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/.terraform.lock.hcl
diff --git a/...orkspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/main.tf b/...orkspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.41.0"
+      version = "=3.112.0"
     }
     template = {
       source  = "hashicorp/template"

diff --git a/...space_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/upgrade.sh b/...space_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/upgrade.sh
@@ -0,0 +1,13 @@
+#!/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/...es/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/porter.yaml b/...es/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-windowsvm-ouh2
-version: 1.0.0
+version: 1.0.1
 description: "An Azure TRE User Resource Template for Guacamole (Windows 10)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...ces/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/.terraform.lock.hcl b/...ces/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/.terraform.lock.hcl
diff --git a/...kspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/main.tf b/...kspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.57.0"
+      version = "=3.112.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/...ace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/upgrade.sh b/...ace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/upgrade.sh
@@ -0,0 +1,13 @@
+#!/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"