Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix public exposure in Guacamole service #4236

Merged
merged 8 commits into from
Jan 2, 2025
Merged

Fix public exposure in Guacamole service #4236

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f62fddb
Update Guacamole service exposure settings and change the service pla…
ShakutaiGit Dec 31, 2024
ede041b
Merge branch 'main' into fix_exposed_externally_guacamole
ShakutaiGit Dec 31, 2024
84f6beb
set external exposure default to true
ShakutaiGit Dec 31, 2024
2e11b51
Merge branch 'fix_exposed_externally_guacamole' of https://github.com…
ShakutaiGit Dec 31, 2024
26f8151
update the changelog.md
ShakutaiGit Jan 1, 2025
17bd0f4
Remove extra newline in changelog
ShakutaiGit Jan 1, 2025
ab9935a
change the env default value.
ShakutaiGit Jan 2, 2025
47b233e
Merge branch 'main' into fix_exposed_externally_guacamole
ShakutaiGit Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole
version: 0.12.5
version: 0.12.6
ShakutaiGit marked this conversation as resolved.
Show resolved Hide resolved
description: "An Azure TRE service for Guacamole"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
5 changes: 5 additions & 0 deletions templates/workspace_services/guacamole/terraform/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,8 @@ data "azurerm_monitor_diagnostic_categories" "guacamole" {
azurerm_linux_web_app.guacamole,
]
}

data "azurerm_service_plan" "workspace" {
name = "plan-${var.workspace_id}"
resource_group_name = data.azurerm_resource_group.ws.name
}
6 changes: 1 addition & 5 deletions templates/workspace_services/guacamole/terraform/web_app.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
data "azurerm_service_plan" "workspace" {
name = "plan-${var.workspace_id}"
resource_group_name = data.azurerm_resource_group.ws.name
}

# we have to use user-assigned to break a cycle in the dependencies: app identity, kv-policy, secrets in app settings
resource "azurerm_user_assigned_identity" "guacamole_id" {
resource_group_name = data.azurerm_resource_group.ws.name
Expand All @@ -24,6 +19,7 @@ resource "azurerm_linux_web_app" "guacamole" {
ftp_publish_basic_authentication_enabled = false
webdeploy_publish_basic_authentication_enabled = false
tags = local.workspace_service_tags
public_network_access_enabled = var.is_exposed_externally

site_config {
http2_enabled = true
Expand Down
Loading