AML NSG fixes (#2768)

microsoft · Oct 21, 2022 · 4d0e25d · 4d0e25d
1 parent 79397a9
commit 4d0e25d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ ENHANCEMENTS:
 * `tre` CLI: added `raw` output option, improved `airlock-requests` handling, more consistent exit codes on error, added examples to CLI README.md
 
 BUG FIXES:
+* Fix issues with AML workspace service deployment ([#2768](https://github.com/microsoft/AzureTRE/pull/2768))
 
 COMPONENTS:
 

diff --git a/templates/workspace_services/azureml/porter.yaml b/templates/workspace_services/azureml/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-azureml
-version: 0.5.1
+version: 0.5.6
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -95,7 +95,7 @@ outputs:
 
 mixins:
   - terraform:
-      clientVersion: 1.2.6
+      clientVersion: 1.3.3
 
 install:
   - terraform:

diff --git a/templates/workspace_services/azureml/terraform/.terraform.lock.hcl b/templates/workspace_services/azureml/terraform/.terraform.lock.hcl
diff --git a/templates/workspace_services/azureml/terraform/get_nsg_priorities.sh b/templates/workspace_services/azureml/terraform/get_nsg_priorities.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -o errexit
 set -o pipefail
 set -o nounset
 
@@ -10,7 +9,7 @@ eval "$(jq -r '@sh "nsg_name=\(.nsg_name) resource_group_name=\(.resource_group_
 if NSG_RULE=$(az network nsg rule show -g "${resource_group_name?}" --nsg-name "${nsg_name?}" --name "${nsg_rule_name?}" -o json); then
     NSG_RULE_PRIORITY=$(echo "$NSG_RULE" | jq '.priority')
 else
-    NSG_RULE_MAX_PRIORITY=$(az network nsg rule list -g "${resource_group_name?}" --nsg-name  "${resource_group_name?}" --query "not_null(max_by([?direction=='${direction?}' && access=='Allow'],&priority).priority) || '100'" -o json)
+    NSG_RULE_MAX_PRIORITY=$(az network nsg rule list -g "${resource_group_name?}" --nsg-name  "${nsg_name?}" --query "not_null(max_by([?direction=='${direction?}' && access=='Allow'],&priority).priority) || '100'" -o json)
     # without $(()) command fails
     # shellcheck disable=SC2004
     NSG_RULE_PRIORITY=$(($NSG_RULE_MAX_PRIORITY + 1))

diff --git a/templates/workspace_services/azureml/terraform/providers.tf b/templates/workspace_services/azureml/terraform/providers.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.5.0"
+      version = "=3.27.0"
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "=0.3.0"
+      version = "=1.0.0"
     }
     external = {
       source  = "hashicorp/external"