From b26c5adb10eec05f559dc88292e73127c069bcb3 Mon Sep 17 00:00:00 2001 From: Marcus Robinson <marrobi@microsoft.com> Date: Tue, 30 Jul 2024 13:06:34 +0100 Subject: [PATCH 1/3] Fix Guacamole shared drive always enabled Related to #3885 Update Guacamole shared drive configuration to respect the 'drive' option setting. * Change the default value of `guac_enable_drive` to `false` in `templates/workspace_services/guacamole/porter.yaml`. * Change the default value of `guac_enable_drive` to `false` in `templates/workspace_services/guacamole/template_schema.json`. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/microsoft/AzureTRE/issues/3885?shareId=XXXX-XXXX-XXXX-XXXX). --- templates/workspace_services/guacamole/porter.yaml | 2 +- templates/workspace_services/guacamole/template_schema.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index dd081ea0b9..910efe2baa 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -53,7 +53,7 @@ parameters: description: "Guacamole disable paste configuration" - name: guac_enable_drive type: boolean - default: true + default: false env: GUAC_ENABLE_DRIVE description: "Guacamole enable drive configuration" - name: guac_drive_name diff --git a/templates/workspace_services/guacamole/template_schema.json b/templates/workspace_services/guacamole/template_schema.json index e0f052bd08..fa644e5c2c 100644 --- a/templates/workspace_services/guacamole/template_schema.json +++ b/templates/workspace_services/guacamole/template_schema.json @@ -46,7 +46,8 @@ "type": "boolean", "title": "Enable Drive", "description": "Enable mounted drive", - "updateable": true + "updateable": true, + "default": false }, "guac_disable_download": { "$id": "#/properties/guac_disable_download", From abdb5db6acad578cc3f025eee6ad3696596494b4 Mon Sep 17 00:00:00 2001 From: Marcus Robinson <marrobi@microsoft.com> Date: Wed, 31 Jul 2024 13:08:03 +0100 Subject: [PATCH 2/3] Update change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e7badc25..6562ca1f7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ENHANCEMENTS: BUG FIXES: * Fix numbering issue within `bug_report.md` template ([#4028](https://github.com/microsoft/AzureTRE/pull/4028)) * Disable public network access to the API App Service ([#3986](https://github.com/microsoft/AzureTRE/issues/3986)) +* Fix Guacamole shared drive always enabled ([#4046](https://github.com/microsoft/AzureTRE/pull/4046)) COMPONENTS: From c6b49e770dbe78136d1873387350b421f9537f3a Mon Sep 17 00:00:00 2001 From: Marcus Robinson <marrobi@microsoft.com> Date: Thu, 1 Aug 2024 09:42:11 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6562ca1f7c..0605928540 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ ENHANCEMENTS: BUG FIXES: * Fix numbering issue within `bug_report.md` template ([#4028](https://github.com/microsoft/AzureTRE/pull/4028)) * Disable public network access to the API App Service ([#3986](https://github.com/microsoft/AzureTRE/issues/3986)) -* Fix Guacamole shared drive always enabled ([#4046](https://github.com/microsoft/AzureTRE/pull/4046)) +* Fix Guacamole shared drive always enabled ([#3885](https://github.com/microsoft/AzureTRE/issues/3885)) COMPONENTS: