Merge pull request #59 from Barts-Life-Science/andrii-dev

Airlock Notifier updates

.gitignore

@@ -183,7 +183,6 @@ terraform.rc
 **/http-client.private.env.json
 
 # vscode
-.vscode
 
 # node
 node_modules

templates/shared_services/airlock_notifier/app/AirlockNotifier/workflow.json

@@ -147,34 +147,35 @@
         "runAfter": {},
         "type": "ParseJson"
       },
-      "Send_Email_with_SMTP": {
+      "Send_an_email_(V2)": {
         "inputs": {
-          "parameters": {
-            "body": "<a href=\"@{parameters('tre_url')}/workspaces/@{body('Parse_JSON')?['data']?['workspace']?['id']}/requests/@{body('Parse_JSON')?['data']?['request']?['id']}\">View the request</a>",
-            "from": "@parameters('smtp_from_email')",
-            "importance": "Normal",
-            "subject": "@variables('message')",
-            "to": "@{join(variables('recipients'), ';')}"
-          },
-          "serviceProviderConfiguration": {
-            "connectionName": "Smtp",
-            "operationId": "sendEmail",
-            "serviceProviderId": "/serviceProviders/Smtp"
-          }
+            "body": {
+                "Body": "<p>@{concat(parameters('tre_url'),'/workspaces/',body('Parse_JSON')?['data']?['workspace']?['id'],'/requests/',body('Parse_JSON')?['data']?['request']?['id'])}</p>",
+                "Importance": "Normal",
+                "Subject": "@variables('message')",
+                "To": "@{join(variables('recipients'),';')}"
+            },
+            "host": {
+                "connection": {
+                    "referenceName": "outlook"
+                }
+            },
+            "method": "post",
+            "path": "/v2/Mail"
         },
         "runAfter": {
-          "Switch_on_request_status": [
-            "Succeeded"
-          ]
+            "Switch_on_request_status": [
+                "SUCCEEDED"
+            ]
         },
-        "type": "ServiceProvider"
-      },
+        "type": "ApiConnection"
+    },
       "Succeeded": {
         "inputs": {
           "runStatus": "Succeeded"
         },
         "runAfter": {
-          "Send_Email_with_SMTP": [
+          "Send_an_email_(V2)": [
             "Succeeded"
           ]
         },

templates/shared_services/airlock_notifier/app/connections.json

@@ -35,6 +35,18 @@
         "type": "ManagedServiceIdentity"
       },
       "connectionRuntimeUrl": "@appsetting('smtp_connection_runtime_url')"
-    }
+    },
+      "outlook": {
+          "api": {
+              "id": "/subscriptions/@appsetting('subscription')/providers/Microsoft.Web/locations/uksouth/managedApis/outlook"
+          },
+          "authentication": {
+              "type": "ManagedServiceIdentity"
+          },
+          "connection": {
+              "id": "/subscriptions/@appsetting('subscription')/resourceGroups/@appsetting('resource_group')/providers/Microsoft.Web/connections/outlook"
+          },
+          "connectionRuntimeUrl": "https://dbd1728c4196793d.11.common.logic-uksouth.azure-apihub.net/apim/outlook/3a2261e686234238a0058f766e39e7a4"
+      }
   }
 }

templates/shared_services/airlock_notifier/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-airlock-notifier
-version: 0.9.0
+version: 0.9.3
 description: "A shared service notifying on Airlock Operations"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/airlock_notifier/terraform/airlock_notifier.tf

@@ -36,9 +36,10 @@ resource "azurerm_logic_app_standard" "logic_app" {
   storage_account_name       = data.azurerm_storage_account.storage.name
   storage_account_access_key = data.azurerm_storage_account.storage.primary_access_key
   virtual_network_subnet_id  = data.azurerm_subnet.airlock_notification.id
+  version                    = "~4"
   app_settings = {
     "FUNCTIONS_WORKER_RUNTIME"              = "node"
-    "WEBSITE_NODE_DEFAULT_VERSION"          = "~12"
+    "WEBSITE_NODE_DEFAULT_VERSION"          = "~14"
     "serviceBus_connectionString"           = data.azurerm_servicebus_namespace.core.default_primary_connection_string
     "subscription"                          = data.azurerm_subscription.current.subscription_id
     "resource_group"                        = data.azurerm_resource_group.core.name

templates/workspaces/base-adf/terraform/adf_link.tf

@@ -6,10 +6,10 @@ data "azurerm_data_factory" "adf_core" {
 
 # Create a private endpoint to the storage account from the data platform
 resource "azurerm_data_factory_managed_private_endpoint" "adf_dataplatform_pe" {
-  name                = "pe-adf-ws-${local.workspace_resource_name_suffix}"
-  data_factory_id     = data.azurerm_data_factory.adf_core.id
-  target_resource_id  = azurerm_storage_account.stg.id
-  subresource_name    = "file"
+  name               = "pe-adf-ws-${local.workspace_resource_name_suffix}"
+  data_factory_id    = data.azurerm_data_factory.adf_core.id
+  target_resource_id = azurerm_storage_account.stg.id
+  subresource_name   = "file"
 }
 
 
@@ -29,5 +29,3 @@ resource "azurerm_data_factory_linked_service_azure_file_storage" "ls_shared_fil
   integration_runtime_name = "adf-ir-${var.tre_id}"
   file_share               = "vm-shared-storage"
 }
-
-# Create a data source in the data factory

templates/workspaces/base-adf/terraform/providers.tf

@@ -12,6 +12,10 @@ terraform {
       source  = "Azure/azapi"
       version = "=1.5.0"
     }
+    null = {
+      source  = "hashicorp/null"
+      version = "3.2.2"
+    }
   }
 
   backend "azurerm" {}
@@ -42,3 +46,6 @@ provider "azuread" {
 
 provider "azapi" {
 }
+
+provider "null" {
+}