Fix Guacamole's authentication URI to support auto update in workspace app

templates/workspace_services/guacamole/porter.yaml

@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole
-version: 0.3.7
+version: 0.3.8
 description: "An Azure TRE service for Guacamole"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -101,11 +101,16 @@ outputs:
     type: string
     applyTo:
       - install
+  - name: authentication_callback_uri
+    type: string
+    applyTo:
+      - install
 
 mixins:
   - exec
   - terraform:
       clientVersion: 1.1.7
+      initFile: providers.tf
 
 install:
   - terraform:
@@ -137,6 +142,7 @@ install:
         key: "tre-service-guacamole-{{ bundle.parameters.id }}"
       outputs:
         - name: connection_uri
+        - name: authentication_callback_uri
 
 upgrade:
   - exec:

templates/workspace_services/guacamole/template_schema.json

@@ -66,7 +66,7 @@
             "arrayMatchField": "name",
             "value": {
               "name": "{{ resource.id }}",
-              "value": "{{ resource.properties.connection_uri }}"
+              "value": "{{ resource.properties.authentication_callback_uri }}"
             }
           }
         ]
@@ -90,7 +90,7 @@
             "arrayMatchField": "name",
             "value": {
               "name": "{{ resource.id }}",
-              "value": "{{ resource.properties.connection_uri }}"
+              "value": "{{ resource.properties.authentication_callback_uri }}"
             }
           }
         ]

templates/workspace_services/guacamole/terraform/main.tf

@@ -1,32 +1,3 @@
-# Azure Provider source and version being used
-terraform {
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "=3.5.0"
-    }
-  }
-  backend "azurerm" {
-  }
-}
-
-provider "azurerm" {
-  features {
-    key_vault {
-      # Don't purge on destroy (this would fail due to purge protection being enabled on keyvault)
-      purge_soft_delete_on_destroy               = false
-      purge_soft_deleted_secrets_on_destroy      = false
-      purge_soft_deleted_certificates_on_destroy = false
-      purge_soft_deleted_keys_on_destroy         = false
-      # When recreating an environment, recover any previously soft deleted secrets - set to true by default
-      recover_soft_deleted_key_vaults   = true
-      recover_soft_deleted_secrets      = true
-      recover_soft_deleted_certificates = true
-      recover_soft_deleted_keys         = true
-    }
-  }
-}
-
 data "azurerm_client_config" "current" {}
 
 data "azurerm_resource_group" "ws" {
@@ -112,3 +83,7 @@ data "local_file" "version" {
 output "connection_uri" {
   value = "https://${azurerm_app_service.guacamole.default_site_hostname}/guacamole"
 }
+
+output "authentication_callback_uri" {
+  value = "https://${azurerm_app_service.guacamole.default_site_hostname}/oauth2/callback"
+}

templates/workspace_services/guacamole/terraform/providers.tf

@@ -0,0 +1,27 @@
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "=3.5.0"
+    }
+  }
+  backend "azurerm" {
+  }
+}
+
+provider "azurerm" {
+  features {
+    key_vault {
+      # Don't purge on destroy (this would fail due to purge protection being enabled on keyvault)
+      purge_soft_delete_on_destroy               = false
+      purge_soft_deleted_secrets_on_destroy      = false
+      purge_soft_deleted_certificates_on_destroy = false
+      purge_soft_deleted_keys_on_destroy         = false
+      # When recreating an environment, recover any previously soft deleted secrets - set to true by default
+      recover_soft_deleted_key_vaults   = true
+      recover_soft_deleted_secrets      = true
+      recover_soft_deleted_certificates = true
+      recover_soft_deleted_keys         = true
+    }
+  }
+}