From e16f0c709059f6750e427bc9de6ade3a33d162ce Mon Sep 17 00:00:00 2001
From: marrobi <marrobi@microsoft.com>
Date: Tue, 6 Jun 2023 20:59:42 +0000
Subject: [PATCH 1/3] Azure ML connection URI is an object, not string Fixes
 #3486

---
 templates/workspace_services/azureml/porter.yaml         | 9 +--------
 .../workspace_services/azureml/terraform/outputs.tf      | 6 +-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/templates/workspace_services/azureml/porter.yaml b/templates/workspace_services/azureml/porter.yaml
index 3531d5ed35..45bd8e9112 100644
--- a/templates/workspace_services/azureml/porter.yaml
+++ b/templates/workspace_services/azureml/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-azureml
-version: 0.8.2
+version: 0.8.4
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -85,11 +85,6 @@ outputs:
     applyTo:
       - install
       - upgrade
-  - name: internal_connection_uri
-    type: string
-    applyTo:
-      - install
-      - upgrade
   - name: workspace_address_spaces
     type: string
     applyTo:
@@ -154,7 +149,6 @@ install:
         - name: azureml_acr_id
         - name: azureml_storage_account_id
         - name: connection_uri
-        - name: internal_connection_uri
         - name: workspace_address_spaces
         - name: aml_subnet_address_prefixes
         - name: storage_tag
@@ -188,7 +182,6 @@ upgrade:
         - name: azureml_acr_id
         - name: azureml_storage_account_id
         - name: connection_uri
-        - name: internal_connection_uri
         - name: workspace_address_spaces
         - name: aml_subnet_address_prefixes
         - name: storage_tag
diff --git a/templates/workspace_services/azureml/terraform/outputs.tf b/templates/workspace_services/azureml/terraform/outputs.tf
index 82306ad545..63823ddeb7 100644
--- a/templates/workspace_services/azureml/terraform/outputs.tf
+++ b/templates/workspace_services/azureml/terraform/outputs.tf
@@ -15,11 +15,7 @@ output "aml_fqdn" {
 }
 
 output "connection_uri" {
-  value = var.is_exposed_externally ? format("%s/?wsid=%s&tid=%s", module.terraform_azurerm_environment_configuration.aml_studio_endpoint, azurerm_machine_learning_workspace.aml_workspace.id, var.arm_tenant_id) : ""
-}
-
-output "internal_connection_uri" {
-  value = var.is_exposed_externally ? "" : format("%s/?wsid=%s&tid=%s", module.terraform_azurerm_environment_configuration.aml_studio_endpoint, azurerm_machine_learning_workspace.aml_workspace.id, var.arm_tenant_id)
+  value =  format("%s/?wsid=%s&tid=%s", module.terraform_azurerm_environment_configuration.aml_studio_endpoint, azurerm_machine_learning_workspace.aml_workspace.id, var.arm_tenant_id)
 }
 
 output "workspace_address_spaces" {

From ead351331157876bef3272aad704f7d258504a20 Mon Sep 17 00:00:00 2001
From: marrobi <marrobi@microsoft.com>
Date: Tue, 6 Jun 2023 21:02:52 +0000
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29a30f5d40..d633589cc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ BUG FIXES:
 * Nexus might fail to deploy due to wrong identity used in key-vault extension ([#3492](https://github.com/microsoft/AzureTRE/issues/3492))
 * Airlock notifier needs SCM basic-auth enabled to install ([#3509](https://github.com/microsoft/AzureTRE/issues/3509))
 * `load_env.sh` is able to use an equal `=` sign in values ([#3535](https://github.com/microsoft/AzureTRE/issues/3535))
+* Azure ML connection URI is an object, not string ([#3486](https://github.com/microsoft/AzureTRE/issues/3486))
+
 
 COMPONENTS:
 

From 01099ec371600c321c723cb72677abadaaf9e1bb Mon Sep 17 00:00:00 2001
From: marrobi <marrobi@microsoft.com>
Date: Wed, 7 Jun 2023 10:15:50 +0000
Subject: [PATCH 3/3] fix linting

---
 templates/workspace_services/azureml/terraform/outputs.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/workspace_services/azureml/terraform/outputs.tf b/templates/workspace_services/azureml/terraform/outputs.tf
index 63823ddeb7..48a152634f 100644
--- a/templates/workspace_services/azureml/terraform/outputs.tf
+++ b/templates/workspace_services/azureml/terraform/outputs.tf
@@ -15,7 +15,7 @@ output "aml_fqdn" {
 }
 
 output "connection_uri" {
-  value =  format("%s/?wsid=%s&tid=%s", module.terraform_azurerm_environment_configuration.aml_studio_endpoint, azurerm_machine_learning_workspace.aml_workspace.id, var.arm_tenant_id)
+  value = format("%s/?wsid=%s&tid=%s", module.terraform_azurerm_environment_configuration.aml_studio_endpoint, azurerm_machine_learning_workspace.aml_workspace.id, var.arm_tenant_id)
 }
 
 output "workspace_address_spaces" {