From 39aa2846941ac02dac76ae8b546d58470c018983 Mon Sep 17 00:00:00 2001
From: tim-allen-ck <tim.allen@cloudkubed.com>
Date: Fri, 12 Apr 2024 09:12:48 +0100
Subject: [PATCH] resolving comments

---
 .../workspace_services/guacamole/user_resources/README.md | 3 +++
 .../user_resources/guacamole-azure-linuxvm/porter.yaml    | 8 ++++----
 .../terraform/apt_sources_config.yml                      | 2 +-
 .../guacamole-azure-linuxvm/terraform/linuxvm.tf          | 2 +-
 .../guacamole-azure-linuxvm/terraform/locals.tf           | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md
index c36a365f21..d0db21cb86 100644
--- a/templates/workspace_services/guacamole/user_resources/README.md
+++ b/templates/workspace_services/guacamole/user_resources/README.md
@@ -34,6 +34,7 @@ custom:
         offer: 0001-com-ubuntu-server-jammy
         sku: 22_04-lts-gen2
         version: latest
+        apt_sku: 22.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS":
@@ -42,6 +43,7 @@ custom:
         offer: 0001-com-ubuntu-server-focal
         sku: 20_04-lts-gen2
         version: latest
+        apt_sku: 20.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS Data Science VM":
@@ -50,6 +52,7 @@ custom:
         offer: ubuntu-2004
         sku: 2004-gen2
         version: latest
+        apt_sku: 20.04
       install_ui: true
       conda_config: true
     # "Custom Image From Gallery":
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 b64a85a149..193a834853 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: 0.6.22
+version: 0.6.23
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -20,7 +20,7 @@ custom:
         offer: 0001-com-ubuntu-server-jammy
         sku: 22_04-lts-gen2
         version: latest
-        apt-sku: 22.04
+        apt_sku: 22.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS":
@@ -29,7 +29,7 @@ custom:
         offer: 0001-com-ubuntu-server-focal
         sku: 20_04-lts-gen2
         version: latest
-        apt-sku: 20.04
+        apt_sku: 20.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS Data Science VM":
@@ -38,7 +38,7 @@ custom:
         offer: ubuntu-2004
         sku: 2004-gen2
         version: latest
-        apt-sku: 20.04
+        apt_sku: 20.04
       install_ui: true
       conda_config: true
     # For information on using custom images, see README.me in the guacamole/user-resources folder
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
index 6d0dc4e9b3..d805cb8983 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
@@ -14,6 +14,6 @@ apt:
     deb [trusted=yes] $PRIMARY $RELEASE main restricted universe multiverse
     deb [trusted=yes] $PRIMARY $RELEASE-updates main restricted universe multiverse
     deb [trusted=yes] $SECURITY $RELEASE main restricted universe multiverse
-    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${sku}/prod $RELEASE main
+    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${apt_sku}/prod $RELEASE main
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/edge stable main
     deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf
index 4f286ab659..d45d5d3a00 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf
@@ -131,7 +131,7 @@ data "template_file" "apt_sources_config" {
   template = file("${path.module}/apt_sources_config.yml")
   vars = {
     nexus_proxy_url = local.nexus_proxy_url
-    sku             = local.apt_sku
+    apt_sku             = local.apt_sku
   }
 }
 
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 56c957e4eb..e0281269fd 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
@@ -25,5 +25,5 @@ locals {
   # selected_image_source_refs is an array to enable easy use of a dynamic block
   selected_image_source_refs = lookup(local.selected_image, "source_image_reference", null) == null ? [] : [local.selected_image.source_image_reference]
   selected_image_source_id   = lookup(local.selected_image, "source_image_name", null) == null ? null : "${var.image_gallery_id}/images/${local.selected_image.source_image_name}"
-  apt_sku                    = local.selected_image_source_refs[0]["apt-sku"]
+  apt_sku                    = local.selected_image_source_refs[0]["apt_sku"]
 }