Update AML to enable private IP compute

Makefile

@@ -134,6 +134,10 @@ terraform-deploy:
 	$(call target_title, "Deploying ${DIR} with Terraform") \
 	&& . ${MAKEFILE_DIR}/devops/scripts/check_dependencies.sh env \
 	&& . ${MAKEFILE_DIR}/devops/scripts/load_and_validate_env.sh \
+	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${DIR}/.env \
+	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${MAKEFILE_DIR}/devops/.env \
+	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${MAKEFILE_DIR}/templates/core/.env \
+	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${MAKEFILE_DIR}/devops/auth.env \
 	&& cd ${DIR}/terraform/ && ./deploy.sh
 
 terraform-import:

core/terraform/storage.tf

@@ -36,6 +36,15 @@ resource "azurerm_private_endpoint" "blobpe" {
   }
 }
 
+data "azurerm_private_dns_zone" "filecore" {
+  name                = "privatelink.file.core.windows.net"
+  resource_group_name = azurerm_resource_group.core.name
+
+  depends_on = [
+    module.network
+  ]
+}
+
 resource "azurerm_private_endpoint" "filepe" {
   name                = "pe-file-${var.tre_id}"
   location            = azurerm_resource_group.core.location

templates/workspace_services/azureml/.env.sample

@@ -8,3 +8,5 @@ WORKSPACE_ID="__CHANGE_ME__"
 DISPLAY_NAME="__CHANGE_ME__"
 DESCRIPTION="__CHANGE_ME__"
 IS_EXPOSED_EXTERNALLY="false"
+
+ADDRESS_SAPCE="__CHANGE_ME__"

templates/workspace_services/azureml/parameters.json

@@ -34,6 +34,12 @@
         "env": "DESCRIPTION"
       }
     },
+    {
+      "name": "address_space",
+      "source": {
+        "env": "ADDRESS_SPACE"
+      }
+    },
     {
       "name": "is_exposed_externally",
       "source": {

templates/workspace_services/azureml/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-azureml
-version: 0.6.0
+version: 0.7.17
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -41,6 +41,9 @@ parameters:
     default: false
     env: IS_EXPOSED_EXTERNALLY
     description: "Determines if the AML workspace will be available over public/internet"
+  - name: address_space
+    type: string
+    description: "Address space for the AML subnets"
   - name: tfstate_resource_group_name
     type: string
     description: "Resource group containing the Terraform state storage account"
@@ -83,7 +86,12 @@ outputs:
     applyTo:
       - install
       - upgrade
-  - name: workspace_services_subnet_address_prefix
+  - name: workspace_address_spaces
+    type: string
+    applyTo:
+      - install
+      - upgrade
+  - name: aml_subnet_address_prefixes
     type: string
     applyTo:
       - install
@@ -93,6 +101,16 @@ outputs:
     applyTo:
       - install
       - upgrade
+  - name: batch_tag
+    type: string
+    applyTo:
+      - install
+      - upgrade
+  - name: mcr_tag
+    type: string
+    applyTo:
+      - install
+      - upgrade
 
 mixins:
   - terraform:
@@ -111,11 +129,9 @@ install:
         tre_resource_id: ${ bundle.parameters.id }
         display_name: ${ bundle.parameters.display_name }
         description: ${ bundle.parameters.description }
+        address_space: ${ bundle.parameters.address_space }
         is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
         arm_tenant_id: ${ bundle.credentials.azure_tenant_id }
-        arm_client_id: ${ bundle.credentials.azure_client_id }
-        arm_client_secret: ${ bundle.credentials.azure_client_secret }
-        arm_use_msi: ${ bundle.parameters.arm_use_msi }
         auth_client_id: ${ bundle.credentials.auth_client_id }
         auth_client_secret: ${ bundle.credentials.auth_client_secret }
         auth_tenant_id: ${ bundle.credentials.auth_tenant_id }
@@ -130,8 +146,11 @@ install:
         - name: azureml_storage_account_id
         - name: connection_uri
         - name: internal_connection_uri
-        - name: workspace_services_subnet_address_prefix
+        - name: workspace_address_spaces
+        - name: aml_subnet_address_prefixes
         - name: storage_tag
+        - name: batch_tag
+        - name: mcr_tag
 
 upgrade:
   - terraform:
@@ -142,11 +161,9 @@ upgrade:
         tre_resource_id: ${ bundle.parameters.id }
         display_name: ${ bundle.parameters.display_name }
         description: ${ bundle.parameters.description }
+        address_space: ${ bundle.parameters.address_space }
         is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
         arm_tenant_id: ${ bundle.credentials.azure_tenant_id }
-        arm_client_id: ${ bundle.credentials.azure_client_id }
-        arm_client_secret: ${ bundle.credentials.azure_client_secret }
-        arm_use_msi: ${ bundle.parameters.arm_use_msi }
         auth_client_id: ${ bundle.credentials.auth_client_id }
         auth_client_secret: ${ bundle.credentials.auth_client_secret }
         auth_tenant_id: ${ bundle.credentials.auth_tenant_id }
@@ -161,8 +178,11 @@ upgrade:
         - name: azureml_storage_account_id
         - name: connection_uri
         - name: internal_connection_uri
-        - name: workspace_services_subnet_address_prefix
+        - name: workspace_address_spaces
+        - name: aml_subnet_address_prefixes
         - name: storage_tag
+        - name: batch_tag
+        - name: mcr_tag
 
 uninstall:
   - terraform:
@@ -173,11 +193,9 @@ uninstall:
         tre_resource_id: ${ bundle.parameters.id }
         display_name: ${ bundle.parameters.display_name }
         description: ${ bundle.parameters.description }
+        address_space: ${ bundle.parameters.address_space }
         is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
-        arm_use_msi: ${ bundle.parameters.arm_use_msi }
         arm_tenant_id: ${ bundle.credentials.azure_tenant_id }
-        arm_client_id: ${ bundle.credentials.azure_client_id }
-        arm_client_secret: ${ bundle.credentials.azure_client_secret }
         auth_client_id: ${ bundle.credentials.auth_client_id }
         auth_client_secret: ${ bundle.credentials.auth_client_secret }
         auth_tenant_id: ${ bundle.credentials.auth_tenant_id }