Skip to content

Commit 53c1547

Browse files
committed
Allow USER_MANAGEMENT_ENABLED config variable to set via CI/CD
1 parent 8acf4f5 commit 53c1547

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

.github/actions/devcontainer_run_command/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ inputs:
145145
description: "The Azure Resource ID for an external key store to use for CMK"
146146
required: false
147147
default: ""
148+
USER_MANAGEMENT_ENABLED:
149+
description: "If set to true TRE Admins are able to assign and de-assign users to workspaces via the UI"
150+
required: false
151+
default: "false"
148152

149153
runs:
150154
using: composite
@@ -270,6 +274,8 @@ runs:
270274
&& inputs.ENABLE_CMK_ENCRYPTION) || 'false' }}" \
271275
-e TF_VAR_encryption_kv_name="${{ inputs.ENCRYPTION_KV_NAME }}" \
272276
-e TF_VAR_external_key_store_id="${{ inputs.EXTERNAL_KEY_STORE_ID }}" \
277+
-e TF_VAR_user_management_enabled="${{ inputs.USER_MANAGEMENT_ENABLED }}" \
278+
-e USER_MANAGEMENT_ENABLED="${{ inputs.USER_MANAGEMENT_ENABLED }}" \
273279
-e E2E_TESTS_NUMBER_PROCESSES="${{ inputs.E2E_TESTS_NUMBER_PROCESSES }}" \
274280
'${{ inputs.CI_CACHE_ACR_NAME }}${{ env.ACR_DOMAIN_SUFFIX }}/tredev:${{ inputs.DEVCONTAINER_TAG }}' \
275281
bash -c -x "./command.sh"

.github/workflows/deploy_tre_reusable.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ jobs:
378378
ENABLE_CMK_ENCRYPTION: ${{ vars.ENABLE_CMK_ENCRYPTION }}
379379
ENCRYPTION_KV_NAME: ${{ secrets.ENCRYPTION_KV_NAME }}
380380
EXTERNAL_KEY_STORE_ID: ${{ secrets.EXTERNAL_KEY_STORE_ID }}
381+
USER_MANAGEMENT_ENABLED: ${{ vars.USER_MANAGEMENT_ENABLED }}
381382

382383
- name: API Healthcheck
383384
uses: ./.github/actions/devcontainer_run_command
@@ -764,6 +765,7 @@ jobs:
764765
MGMT_RESOURCE_GROUP_NAME: ${{ secrets.MGMT_RESOURCE_GROUP_NAME }}
765766
MGMT_STORAGE_ACCOUNT_NAME: ${{ secrets.MGMT_STORAGE_ACCOUNT_NAME }}
766767
SWAGGER_UI_CLIENT_ID: "${{ secrets.SWAGGER_UI_CLIENT_ID }}"
768+
USER_MANAGEMENT_ENABLED: ${{ vars.USER_MANAGEMENT_ENABLED }}
767769

768770
e2e_tests_smoke:
769771
name: "Run E2E Tests (Smoke)"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENHANCEMENTS:
88
* Added ability to assign VMs to other users at creation time ([#1179](https://github.com/microsoft/AzureTRE/issues/1179))
99
* Add shutdown schedule to Windows VMs ([#4211](https://github.com/microsoft/AzureTRE/pull/4211))
1010
* Add deploy and sku variables to control deployment of Azure Bastion ([#4383](https://github.com/microsoft/AzureTRE/pull/4383))
11+
* Allow USER_MANAGEMENT_ENABLED config variable to set via CI/CD ([#4517](https://github.com/microsoft/AzureTRE/issues/4517))
1112

1213
BUG FIXES:
1314
* Letsencrypt.yml fails with "Invalid reference in variable validation" ([#4506](https://github.com/microsoft/AzureTRE/4506))

0 commit comments

Comments
 (0)