From 019236216d330a8291d956f3a5d65c0d7a91e9f2 Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Tue, 18 Feb 2025 12:17:28 +0000 Subject: [PATCH] Fix username generation. --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 3 +-- .../user_resources/guacamole-azure-linuxvm/terraform/locals.tf | 2 +- .../user_resources/guacamole-azure-windowsvm/porter.yaml | 2 +- .../guacamole-azure-windowsvm/terraform/locals.tf | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml index a96a00657..75540ef8e 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole-linuxvm -version: 1.3.5 +version: 1.2.6 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -50,7 +50,6 @@ credentials: - name: auth_tenant_id env: AUTH_TENANT_ID - parameters: - name: workspace_id type: string diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf index fd2266eee..438dc9c8e 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf @@ -8,7 +8,7 @@ locals { keyvault_name = lower("kv-${substr(local.workspace_resource_name_suffix, -20, -1)}") storage_name = lower(replace("stg${substr(local.workspace_resource_name_suffix, -8, -1)}", "-", "")) admin_username = ( - ((length(data.azuread_user.user.mail) > 0) && (contains(data.azuread_user.user.user_principal_name, "#EXT#"))) ? + length(data.azuread_user.user.mail) > 0 && contains(data.azuread_user.user.user_principal_name, "#EXT#") ? substr(element(split("@", data.azuread_user.user.mail), 0), 0, 20) : substr( contains(element(split("@", data.azuread_user.user.user_principal_name), 0), "#EXT#") ? diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml index e22f18089..93a616c63 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole-windowsvm -version: 1.2.7 +version: 1.2.8 description: "An Azure TRE User Resource Template for Guacamole (Windows 10)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/locals.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/locals.tf index ca8a63258..d8b120108 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/locals.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/locals.tf @@ -8,7 +8,7 @@ locals { keyvault_name = lower("kv-${substr(local.workspace_resource_name_suffix, -20, -1)}") storage_name = lower(replace("stg${substr(local.workspace_resource_name_suffix, -8, -1)}", "-", "")) admin_username = ( - ((length(data.azuread_user.user.mail) > 0) && (contains(data.azuread_user.user.user_principal_name, "#EXT#"))) ? + length(data.azuread_user.user.mail) > 0 && contains(data.azuread_user.user.user_principal_name, "#EXT#") ? substr(element(split("@", data.azuread_user.user.mail), 0), 0, 20) : substr( contains(element(split("@", data.azuread_user.user.user_principal_name), 0), "#EXT#") ?