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

Azure ML connection URI is an object, not string #3543

Merged
merged 5 commits into from
Jun 7, 2023
Merged

Azure ML connection URI is an object, not string #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e16f0c7
Azure ML connection URI is an object, not string
marrobi Jun 6, 2023
aaca153
Merge branch 'main' of github.com:microsoft/AzureTRE into marrobi/iss…
marrobi Jun 6, 2023
ead3513
Update changelog
marrobi Jun 6, 2023
01099ec
fix linting
marrobi Jun 7, 2023
e164427
Merge branch 'main' into marrobi/issue3486
marrobi Jun 7, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ 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))
* Update key in Linux VM deploy script ([#3434](https://github.com/microsoft/AzureTRE/issues/3434))


COMPONENTS:

## 0.11.0 (April 24, 2023)
Expand Down
9 changes: 1 addition & 8 deletions templates/workspace_services/azureml/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-azureml
version: 0.8.2
version: 0.8.4
description: "An Azure TRE service for Azure Machine Learning"
registry: azuretre
dockerfile: Dockerfile.tmpl
Expand Down Expand Up @@ -85,11 +85,6 @@ outputs:
applyTo:
- install
- upgrade
- name: internal_connection_uri
type: string
applyTo:
- install
- upgrade
- name: workspace_address_spaces
type: string
applyTo:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions templates/workspace_services/azureml/terraform/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down