Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ ENHANCEMENTS:
* Update API, CLI, and UI dependencies to address high-severity Dependabot alerts, including `PyJWT`, `Vite`, `lodash`, `fast-uri`, `flatted`, `immutable`, and `minimatch`.

BUG FIXES:
* Fix intermittent workspace deletion failure caused by `AnotherOperationInProgress` 409 errors on the Azure Monitor (AMPLS) private DNS zone group, by adding an azapi delete retry. ([#3194](https://github.com/microsoft/AzureTRE/issues/3194))
* Fix API timeout and name collision failures on workspace creation by checking storage account name availability and improved logging. ([#4946](https://github.com/microsoft/AzureTRE/pull/4946))
* Fix error handling in airlock processor ([#4929](https://github.com/microsoft/AzureTRE/pull/4929))
* Fix dependabot high severity alerts for packages fast-uri, lodash, picomatch, immutable, minimatch, flatted and PyJWT


## (0.28.0) (March 2, 2026)
**BREAKING CHANGES**
* Sonatype Nexus shared service now requires explicit EULA acceptance (`accept_nexus_eula: true`) when deploying. This ensures compliance with Sonatype Nexus Community Edition licensing. ([#4842](https://github.com/microsoft/AzureTRE/issues/4842))
Expand Down
2 changes: 1 addition & 1 deletion templates/workspaces/base/porter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-workspace-base
version: 2.8.3
version: 2.8.4
description: "A base Azure TRE workspace"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,71 @@ resource "azurerm_private_endpoint" "azure_monitor_private_endpoint" {
is_manual_connection = false
}

private_dns_zone_group {
name = "azure-monitor-private-dns-zone-group"

private_dns_zone_ids = [
var.azure_monitor_dns_zone_id,
var.azure_monitor_oms_opinsights_dns_zone_id,
var.azure_monitor_ods_opinsights_dns_zone_id,
var.azure_monitor_agentsvc_dns_zone_id,
var.blob_core_dns_zone_id,
]
depends_on = [
azurerm_monitor_private_link_scoped_service.ampls_app_insights,
azurerm_monitor_private_link_scoped_service.ampls_log_anaytics,
]
}

# Separate DNS zone group using azapi to avoid AnotherOperationInProgress errors
# See: https://github.com/hashicorp/terraform-provider-azurerm/issues/28715
resource "azapi_resource" "azure_monitor_dns_zone_group" {
type = "Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2023-11-01"
name = "azure-monitor-private-dns-zone-group"
parent_id = azurerm_private_endpoint.azure_monitor_private_endpoint.id

body = {
properties = {
privateDnsZoneConfigs = [
{
name = "privatelink-monitor-azure-com"
properties = {
privateDnsZoneId = var.azure_monitor_dns_zone_id
}
},
{
name = "privatelink-oms-opinsights-azure-com"
properties = {
privateDnsZoneId = var.azure_monitor_oms_opinsights_dns_zone_id
}
},
{
name = "privatelink-ods-opinsights-azure-com"
properties = {
privateDnsZoneId = var.azure_monitor_ods_opinsights_dns_zone_id
}
},
{
name = "privatelink-agentsvc-azure-automation-net"
properties = {
privateDnsZoneId = var.azure_monitor_agentsvc_dns_zone_id
}
},
{
name = "privatelink-blob-core-windows-net"
properties = {
privateDnsZoneId = var.blob_core_dns_zone_id
}
}
]
}
}

response_export_values = ["id"]

retry = {
error_message_regex = ["AnotherOperationInProgress", "Another operation on this or dependent resource is in progress"]
interval_seconds = 15
max_interval_seconds = 90
}

timeouts {
create = "30m"
delete = "30m"
}

depends_on = [
azurerm_monitor_private_link_scoped_service.ampls_app_insights,
azurerm_private_endpoint.azure_monitor_private_endpoint,
]
}

Expand Down
Loading