enable scm basic auth in airlock notifier

microsoft · May 21, 2023 · 3ca3963 · 3ca3963
1 parent c916a0e
commit 3ca3963
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ ENHANCEMENTS:
 
 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 ([#TBD](https://github.com/microsoft/AzureTRE/issues/TBD))
 
 COMPONENTS:
 

diff --git a/templates/shared_services/airlock_notifier/porter.yaml b/templates/shared_services/airlock_notifier/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-airlock-notifier
-version: 0.5.0
+version: 0.6.0
 description: "A shared service notifying on Airlock Operations"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -68,7 +68,7 @@ mixins:
   - az:
       clientVersion: 2.37.0
   - terraform:
-      clientVersion: 1.3.6
+      clientVersion: 1.4.6
 
 install:
   - terraform:
@@ -106,6 +106,24 @@ install:
         identity:
         username: ${ bundle.credentials.azure_client_id }
 
+  - az:
+      arguments:
+        - resource
+        - update
+      flags:
+        resource-group: ${ bundle.outputs.airlock_notifier_logic_app_resource_group_name }
+        name: scm
+        namespace: Microsoft.Web
+        resource-type: basicPublishingCredentialsPolicies
+        parent: sites/${ bundle.outputs.airlock_notifier_logic_app_name }
+        set: "properties.allow=true"
+
+  - exec:
+      description: Wait for SCM Auth settings to kick in
+      command: sleep
+      arguments:
+      - "60"
+
   - az:
       description: "Deploy logic app"
       arguments:
@@ -117,7 +135,7 @@ install:
         name: ${ bundle.outputs.airlock_notifier_logic_app_name }
         resource-group: ${ bundle.outputs.airlock_notifier_logic_app_resource_group_name }
         subscription: ${ bundle.credentials.azure_subscription_id }
-        src: LogicApp.zip
+        src: /cnab/app/LogicApp.zip
 
 
 upgrade:

diff --git a/templates/shared_services/airlock_notifier/terraform/.terraform.lock.hcl b/templates/shared_services/airlock_notifier/terraform/.terraform.lock.hcl
diff --git a/templates/shared_services/airlock_notifier/terraform/providers.tf b/templates/shared_services/airlock_notifier/terraform/providers.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.11.0"
+      version = "=3.57.0"
     }
     local = {
       source  = "hashicorp/local"
-      version = "=2.2.3"
+      version = "=2.4.0"
     }
   }