Fix network tags and depreciated TF for Azure ML. (#4246)

microsoft · Jan 5, 2025 · 5f27bae · 5f27bae
1 parent e74fbe8
commit 5f27bae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ BUG FIXES:
 * Upgrade azurerm terraform provider from v3.112.0 to v3.117.0 to mitiagte storage account deployment issue ([#4004](https://github.com/microsoft/AzureTRE/issues/4004))
 * Fix VM actions where Workspace shared storage doesn't allow shared key access ([#4222](https://github.com/microsoft/AzureTRE/issues/4222))
 * Fix public exposure in Guacamole service ([[#4199](https://github.com/microsoft/AzureTRE/issues/4199)])
+* Fix Azure ML network tags to use name rather than ID ([[#4151](https://github.com/microsoft/AzureTRE/issues/4151)])
+
 COMPONENTS:
 
 ## 0.19.1

diff --git a/templates/workspace_services/azureml/terraform/main.tf b/templates/workspace_services/azureml/terraform/main.tf
@@ -20,7 +20,7 @@ resource "azurerm_machine_learning_workspace" "aml_workspace" {
     ignore_changes = [
       tags,
       image_build_compute_name,
-      public_access_behind_virtual_network_enabled
+      public_network_access_enabled
     ]
   }
 

diff --git a/templates/workspace_services/azureml/terraform/network.tf b/templates/workspace_services/azureml/terraform/network.tf
@@ -67,7 +67,7 @@ resource "azurerm_subnet" "aml" {
   address_prefixes     = [var.address_space]
 
   # need to be disabled for AML private compute
-  private_endpoint_network_policies_enabled     = false
+  private_endpoint_network_policies             = "Disabled"
   private_link_service_network_policies_enabled = false
 
   service_endpoints = [

diff --git a/templates/workspace_services/azureml/terraform/outputs.tf b/templates/workspace_services/azureml/terraform/outputs.tf
@@ -45,13 +45,13 @@ data "azurerm_network_service_tags" "batch_tag" {
 }
 
 output "storage_tag" {
-  value = data.azurerm_network_service_tags.storage_tag.id
+  value = data.azurerm_network_service_tags.storage_tag.name
 }
 
 output "mcr_tag" {
-  value = data.azurerm_network_service_tags.mcr_tag.id
+  value = data.azurerm_network_service_tags.mcr_tag.name
 }
 
 output "batch_tag" {
-  value = data.azurerm_network_service_tags.batch_tag.id
+  value = data.azurerm_network_service_tags.batch_tag.name
 }