From 6b454a37d82c60f22c4ab82e510ac39f43d3d57f Mon Sep 17 00:00:00 2001
From: tim-allen-ck <tim.allen@cloudkubed.com>
Date: Mon, 29 Apr 2024 10:03:44 +0100
Subject: [PATCH] update

---
 .../guacamole-azure-linuxvm/porter.yaml       |  2 +-
 .../terraform/linuxvm.tf                      |  1 +
 .../terraform/vm_config.sh                    | 27 ++++++++++---------
 3 files changed, 17 insertions(+), 13 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 1d3b54a9ec..5fd7c8c17f 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.44
+version: 0.6.45
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
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 dfc32c1997..8172ec77bb 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
@@ -111,6 +111,7 @@ data "template_file" "vm_config" {
     NEXUS_PROXY_URL       = local.nexus_proxy_url
     CONDA_CONFIG          = local.selected_image.conda_config ? 1 : 0
     VM_USER               = random_string.username.result
+    APT_SKU               = replace(local.apt_sku, ".", "")
   }
 }
 
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
index ad9cc4d889..6b1b78499d 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
@@ -62,18 +62,6 @@ sudo apt install azure-cli -y
 echo "init_vm.sh: R Setup"
 sudo apt install -y r-base
 
-## RStudio Desktop
-# echo "init_vm.sh: RStudio"
-# wget https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.07.2-576-amd64.deb -P /tmp
-# sudo gdebi --non-interactive /tmp/rstudio-2022.07.2-576-amd64.deb
-
-## Azure Storage Explorer
-# sudo apt install gnome-keyring -y
-# wget -q ${NEXUS_PROXY_URL}/microsoft-download/A/E/3/AE32C485-B62B-4437-92F7-8B6B2C48CB40/StorageExplorer-linux-x64.tar.gz -P /tmp
-# sudo mkdir /opt/storage-explorer
-# tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer
-# sudo chmod +x /opt/storage-explorer/*.sh
-
 # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts)
 sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh
 
@@ -147,6 +135,21 @@ sudo systemctl restart docker
 # R config
 sudo echo -e "local({\n    r <- getOption(\"repos\")\n    r[\"Nexus\"] <- \"""${NEXUS_PROXY_URL}\"/repository/r-proxy/\"\n    options(repos = r)\n})" | sudo tee /etc/R/Rprofile.site
 
+# RStudio Desktop
+echo "init_vm.sh: RStudio"
+wget ${NEXUS_PROXY_URL}/electron/jammy/amd64/rstudio-2023.12.1-402-amd64.deb -P /tmp/2204
+wget ${NEXUS_PROXY_URL}/electron/focal/amd64/rstudio-2023.12.1-402-amd64.deb -P /tmp/2004
+sudo gdebi --non-interactive /tmp/${APT_SKU}/rstudio-2023.12.1-402-amd64.deb
+
+# Azure Storage Explorer
+sudo snap set system proxy.https="${NEXUS_PROXY_URL}/repository/snapcraft:<proxy_port>"
+sudo apt install gnome-keyring -y
+wget -q ${NEXUS_PROXY_URL}/repository/microsoft-download/A/E/3/AE32C485-B62B-4437-92F7-8B6B2C48CB40/StorageExplorer-linux-x64.tar.gz -P /tmp
+sudo mkdir /opt/storage-explorer
+tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer
+sudo chmod +x /opt/storage-explorer/*.sh
+
+
 ## Cleanup
 echo "init_vm.sh: Cleanup"
 sudo apt -y autoremove