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

Enable scm basic auth in airlock notifier #3509

Merged
merged 3 commits into from
May 21, 2023
Merged

Enable scm basic auth in airlock notifier #3509

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ca3963
enable scm basic auth in airlock notifier
tamirkamara May 21, 2023
9a259fb
changelog
tamirkamara May 21, 2023
7c96daa
fix indentation
tamirkamara May 21, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ([#3509](https://github.com/microsoft/AzureTRE/issues/3509))

COMPONENTS:

Expand Down
24 changes: 21 additions & 3 deletions templates/shared_services/airlock_notifier/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-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
Expand Down Expand Up @@ -68,7 +68,7 @@ mixins:
- az:
clientVersion: 2.37.0
- terraform:
clientVersion: 1.3.6
clientVersion: 1.4.6

install:
- terraform:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
56 changes: 28 additions & 28 deletions templates/shared_services/airlock_notifier/terraform/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions templates/shared_services/airlock_notifier/terraform/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down