From 0bbd9a0afcbd1ffcf5ecc35fe55947871258208e Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 10 Sep 2025 14:35:12 +0100 Subject: [PATCH 1/3] Revert "Remove unused vars from workflows (#74)" This reverts commit 2fcbd8a60a97dd9de81765645b68dce1bcf6fa54. --- .../devcontainer_run_command/action.yml | 20 ++++++++ .github/workflows/deploy_tre.yml | 6 +++ .github/workflows/deploy_tre_branch.yml | 6 +++ .github/workflows/deploy_tre_reusable.yml | 48 +++++++++++++++++++ .github/workflows/register_tre_bundle.yml | 3 ++ 5 files changed, 83 insertions(+) diff --git a/.github/actions/devcontainer_run_command/action.yml b/.github/actions/devcontainer_run_command/action.yml index 0611dad..e6d6578 100644 --- a/.github/actions/devcontainer_run_command/action.yml +++ b/.github/actions/devcontainer_run_command/action.yml @@ -22,6 +22,21 @@ inputs: AAD_TENANT_ID: description: "The Tenant Id where the App is registered and the Test User is registered for the E2E Tests." required: false + TEST_APP_ID: + description: "The Test Application Id used to interact with the API." + required: false + TEST_ACCOUNT_CLIENT_ID: + description: "The Test Automation Account Client Id used to interact with the API." + required: false + TEST_ACCOUNT_CLIENT_SECRET: + description: "The Test Automation Account Client Secret used to interact with the API." + required: false + TEST_WORKSPACE_APP_ID: + description: "The Test Workspace application Id used to interact with the API." + required: false + TEST_WORKSPACE_APP_SECRET: + description: "The Test Workspace application secret used to interact with the API." + required: false TRE_ID: description: "The TRE Id." required: false @@ -259,6 +274,11 @@ runs: -e TRE_ID="${{ inputs.TRE_ID }}" \ -e TF_VAR_tre_id="${{ inputs.TRE_ID }}" \ -e TRE_URL="${{ env.TRE_URL }}" \ + -e TEST_WORKSPACE_APP_ID="${{ inputs.TEST_WORKSPACE_APP_ID }}" \ + -e TEST_WORKSPACE_APP_SECRET="${{ inputs.TEST_WORKSPACE_APP_SECRET }}" \ + -e TEST_APP_ID="${{ inputs.TEST_APP_ID }}" \ + -e TEST_ACCOUNT_CLIENT_ID="${{ inputs.TEST_ACCOUNT_CLIENT_ID }}" \ + -e TEST_ACCOUNT_CLIENT_SECRET="${{ inputs.TEST_ACCOUNT_CLIENT_SECRET }}" \ -e IS_API_SECURED=${{ inputs.IS_API_SECURED }} \ -e DOCKER_BUILDKIT=1 \ -e TF_VAR_stateful_resources_locked=${{ inputs.STATEFUL_RESOURCES_LOCKED }} \ diff --git a/.github/workflows/deploy_tre.yml b/.github/workflows/deploy_tre.yml index 2d5eb7b..1a91cdd 100644 --- a/.github/workflows/deploy_tre.yml +++ b/.github/workflows/deploy_tre.yml @@ -47,8 +47,14 @@ jobs: APPLICATION_ADMIN_CLIENT_ID: ${{ secrets.APPLICATION_ADMIN_CLIENT_ID }} APPLICATION_ADMIN_CLIENT_SECRET: ${{ secrets.APPLICATION_ADMIN_CLIENT_SECRET }} MGMT_RESOURCE_GROUP_NAME: ${{ secrets.MGMT_RESOURCE_GROUP_NAME }} + MS_TEAMS_WEBHOOK_URI: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} MGMT_STORAGE_ACCOUNT_NAME: ${{ secrets.MGMT_STORAGE_ACCOUNT_NAME }} SWAGGER_UI_CLIENT_ID: ${{ secrets.SWAGGER_UI_CLIENT_ID }} + TEST_APP_ID: ${{ secrets.TEST_APP_ID }} + TEST_WORKSPACE_APP_ID: ${{ secrets.TEST_WORKSPACE_APP_ID }} + TEST_WORKSPACE_APP_SECRET: "${{ secrets.TEST_WORKSPACE_APP_SECRET }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} CI_CACHE_ACR_NAME: ${{ secrets.ACR_NAME }} ENCRYPTION_KV_NAME: ${{ secrets.ENCRYPTION_KV_NAME }} diff --git a/.github/workflows/deploy_tre_branch.yml b/.github/workflows/deploy_tre_branch.yml index 580cf34..f4d6497 100644 --- a/.github/workflows/deploy_tre_branch.yml +++ b/.github/workflows/deploy_tre_branch.yml @@ -78,8 +78,14 @@ jobs: APPLICATION_ADMIN_CLIENT_ID: ${{ secrets.APPLICATION_ADMIN_CLIENT_ID }} APPLICATION_ADMIN_CLIENT_SECRET: ${{ secrets.APPLICATION_ADMIN_CLIENT_SECRET }} MGMT_RESOURCE_GROUP_NAME: ${{ format('rg-tre{0}-mgmt', needs.prepare-not-main.outputs.refid) }} + MS_TEAMS_WEBHOOK_URI: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} MGMT_STORAGE_ACCOUNT_NAME: ${{ format('tre{0}mgmt', needs.prepare-not-main.outputs.refid) }} SWAGGER_UI_CLIENT_ID: ${{ secrets.SWAGGER_UI_CLIENT_ID }} + TEST_APP_ID: ${{ secrets.TEST_APP_ID }} + TEST_WORKSPACE_APP_ID: ${{ secrets.TEST_WORKSPACE_APP_ID }} + TEST_WORKSPACE_APP_SECRET: ${{ secrets.TEST_WORKSPACE_APP_SECRET }} + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ format('tre{0}', needs.prepare-not-main.outputs.refid) }} CI_CACHE_ACR_NAME: ${{ secrets.ACR_NAME }} ENCRYPTION_KV_NAME: ${{ format('tre{0}mgmt', needs.prepare-not-main.outputs.refid) }} diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml index 2ad056b..c6bceab 100644 --- a/.github/workflows/deploy_tre_reusable.yml +++ b/.github/workflows/deploy_tre_reusable.yml @@ -68,12 +68,30 @@ on: # yamllint disable-line rule:truthy MGMT_RESOURCE_GROUP_NAME: description: "" required: true + MS_TEAMS_WEBHOOK_URI: + description: "" + required: true MGMT_STORAGE_ACCOUNT_NAME: description: "" required: true SWAGGER_UI_CLIENT_ID: description: "" required: true + TEST_APP_ID: + description: "" + required: true + TEST_WORKSPACE_APP_ID: + description: "" + required: true + TEST_WORKSPACE_APP_SECRET: + description: "" + required: true + TEST_ACCOUNT_CLIENT_ID: + description: "" + required: true + TEST_ACCOUNT_CLIENT_SECRET: + description: "" + required: true TRE_ID: description: "" required: true @@ -146,6 +164,21 @@ jobs: if [ "${{ secrets.SWAGGER_UI_CLIENT_ID }}" == '' ]; then echo "Missing secret: SWAGGER_UI_CLIENT_ID" && exit 1 fi + if [ "${{ secrets.TEST_APP_ID }}" == '' ]; then + echo "Missing secret: TEST_APP_ID" && exit 1 + fi + if [ "${{ secrets.TEST_WORKSPACE_APP_ID }}" == '' ]; then + echo "Missing secret: TEST_WORKSPACE_APP_ID" && exit 1 + fi + if [ "${{ secrets.TEST_WORKSPACE_APP_SECRET }}" == '' ]; then + echo "Missing secret: TEST_WORKSPACE_APP_SECRET" && exit 1 + fi + if [ "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" == '' ]; then + echo "Missing secret: TEST_ACCOUNT_CLIENT_ID" && exit 1 + fi + if [ "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" == '' ]; then + echo "Missing secret: TEST_ACCOUNT_CLIENT_SECRET" && exit 1 + fi if [ "${{ secrets.TRE_ID }}" == '' ]; then echo "Missing secret: TRE_ID" && exit 1 fi @@ -533,6 +566,9 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} BUNDLE_TYPE: ${{ matrix.BUNDLE_TYPE }} @@ -595,6 +631,9 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} BUNDLE_TYPE: ${{ matrix.BUNDLE_TYPE }} @@ -647,6 +686,9 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} BUNDLE_TYPE: ${{ matrix.BUNDLE_TYPE }} @@ -676,6 +718,9 @@ jobs: AZURE_ENVIRONMENT: ${{ vars.AZURE_ENVIRONMENT }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} @@ -689,6 +734,9 @@ jobs: AZURE_ENVIRONMENT: ${{ vars.AZURE_ENVIRONMENT }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} TERRAFORM_STATE_CONTAINER_NAME: ${{ vars.TERRAFORM_STATE_CONTAINER_NAME }} diff --git a/.github/workflows/register_tre_bundle.yml b/.github/workflows/register_tre_bundle.yml index 8110a01..189227b 100644 --- a/.github/workflows/register_tre_bundle.yml +++ b/.github/workflows/register_tre_bundle.yml @@ -235,5 +235,8 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" + TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" + TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" + TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} LOCATION: ${{ vars.LOCATION }} From 698a8f0ee898a014ab2b09dd62183412be7c9175 Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 10 Sep 2025 14:40:02 +0100 Subject: [PATCH 2/3] TEST_ACCOUNT_CLIENT_ID & TEST_ACCOUNT_CLIENT_SECRET --- .../devcontainer_run_command/action.yml | 12 --------- .github/workflows/deploy_tre.yml | 4 --- .github/workflows/deploy_tre_branch.yml | 4 --- .github/workflows/deploy_tre_reusable.yml | 26 ------------------- .github/workflows/register_tre_bundle.yml | 1 - 5 files changed, 47 deletions(-) diff --git a/.github/actions/devcontainer_run_command/action.yml b/.github/actions/devcontainer_run_command/action.yml index e6d6578..aec1ae3 100644 --- a/.github/actions/devcontainer_run_command/action.yml +++ b/.github/actions/devcontainer_run_command/action.yml @@ -22,21 +22,12 @@ inputs: AAD_TENANT_ID: description: "The Tenant Id where the App is registered and the Test User is registered for the E2E Tests." required: false - TEST_APP_ID: - description: "The Test Application Id used to interact with the API." - required: false TEST_ACCOUNT_CLIENT_ID: description: "The Test Automation Account Client Id used to interact with the API." required: false TEST_ACCOUNT_CLIENT_SECRET: description: "The Test Automation Account Client Secret used to interact with the API." required: false - TEST_WORKSPACE_APP_ID: - description: "The Test Workspace application Id used to interact with the API." - required: false - TEST_WORKSPACE_APP_SECRET: - description: "The Test Workspace application secret used to interact with the API." - required: false TRE_ID: description: "The TRE Id." required: false @@ -274,9 +265,6 @@ runs: -e TRE_ID="${{ inputs.TRE_ID }}" \ -e TF_VAR_tre_id="${{ inputs.TRE_ID }}" \ -e TRE_URL="${{ env.TRE_URL }}" \ - -e TEST_WORKSPACE_APP_ID="${{ inputs.TEST_WORKSPACE_APP_ID }}" \ - -e TEST_WORKSPACE_APP_SECRET="${{ inputs.TEST_WORKSPACE_APP_SECRET }}" \ - -e TEST_APP_ID="${{ inputs.TEST_APP_ID }}" \ -e TEST_ACCOUNT_CLIENT_ID="${{ inputs.TEST_ACCOUNT_CLIENT_ID }}" \ -e TEST_ACCOUNT_CLIENT_SECRET="${{ inputs.TEST_ACCOUNT_CLIENT_SECRET }}" \ -e IS_API_SECURED=${{ inputs.IS_API_SECURED }} \ diff --git a/.github/workflows/deploy_tre.yml b/.github/workflows/deploy_tre.yml index 1a91cdd..71fdf4f 100644 --- a/.github/workflows/deploy_tre.yml +++ b/.github/workflows/deploy_tre.yml @@ -47,12 +47,8 @@ jobs: APPLICATION_ADMIN_CLIENT_ID: ${{ secrets.APPLICATION_ADMIN_CLIENT_ID }} APPLICATION_ADMIN_CLIENT_SECRET: ${{ secrets.APPLICATION_ADMIN_CLIENT_SECRET }} MGMT_RESOURCE_GROUP_NAME: ${{ secrets.MGMT_RESOURCE_GROUP_NAME }} - MS_TEAMS_WEBHOOK_URI: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} MGMT_STORAGE_ACCOUNT_NAME: ${{ secrets.MGMT_STORAGE_ACCOUNT_NAME }} SWAGGER_UI_CLIENT_ID: ${{ secrets.SWAGGER_UI_CLIENT_ID }} - TEST_APP_ID: ${{ secrets.TEST_APP_ID }} - TEST_WORKSPACE_APP_ID: ${{ secrets.TEST_WORKSPACE_APP_ID }} - TEST_WORKSPACE_APP_SECRET: "${{ secrets.TEST_WORKSPACE_APP_SECRET }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} diff --git a/.github/workflows/deploy_tre_branch.yml b/.github/workflows/deploy_tre_branch.yml index f4d6497..7a7c905 100644 --- a/.github/workflows/deploy_tre_branch.yml +++ b/.github/workflows/deploy_tre_branch.yml @@ -78,12 +78,8 @@ jobs: APPLICATION_ADMIN_CLIENT_ID: ${{ secrets.APPLICATION_ADMIN_CLIENT_ID }} APPLICATION_ADMIN_CLIENT_SECRET: ${{ secrets.APPLICATION_ADMIN_CLIENT_SECRET }} MGMT_RESOURCE_GROUP_NAME: ${{ format('rg-tre{0}-mgmt', needs.prepare-not-main.outputs.refid) }} - MS_TEAMS_WEBHOOK_URI: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} MGMT_STORAGE_ACCOUNT_NAME: ${{ format('tre{0}mgmt', needs.prepare-not-main.outputs.refid) }} SWAGGER_UI_CLIENT_ID: ${{ secrets.SWAGGER_UI_CLIENT_ID }} - TEST_APP_ID: ${{ secrets.TEST_APP_ID }} - TEST_WORKSPACE_APP_ID: ${{ secrets.TEST_WORKSPACE_APP_ID }} - TEST_WORKSPACE_APP_SECRET: ${{ secrets.TEST_WORKSPACE_APP_SECRET }} TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ format('tre{0}', needs.prepare-not-main.outputs.refid) }} diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml index c6bceab..e7e668b 100644 --- a/.github/workflows/deploy_tre_reusable.yml +++ b/.github/workflows/deploy_tre_reusable.yml @@ -68,24 +68,12 @@ on: # yamllint disable-line rule:truthy MGMT_RESOURCE_GROUP_NAME: description: "" required: true - MS_TEAMS_WEBHOOK_URI: - description: "" - required: true MGMT_STORAGE_ACCOUNT_NAME: description: "" required: true SWAGGER_UI_CLIENT_ID: description: "" required: true - TEST_APP_ID: - description: "" - required: true - TEST_WORKSPACE_APP_ID: - description: "" - required: true - TEST_WORKSPACE_APP_SECRET: - description: "" - required: true TEST_ACCOUNT_CLIENT_ID: description: "" required: true @@ -164,15 +152,6 @@ jobs: if [ "${{ secrets.SWAGGER_UI_CLIENT_ID }}" == '' ]; then echo "Missing secret: SWAGGER_UI_CLIENT_ID" && exit 1 fi - if [ "${{ secrets.TEST_APP_ID }}" == '' ]; then - echo "Missing secret: TEST_APP_ID" && exit 1 - fi - if [ "${{ secrets.TEST_WORKSPACE_APP_ID }}" == '' ]; then - echo "Missing secret: TEST_WORKSPACE_APP_ID" && exit 1 - fi - if [ "${{ secrets.TEST_WORKSPACE_APP_SECRET }}" == '' ]; then - echo "Missing secret: TEST_WORKSPACE_APP_SECRET" && exit 1 - fi if [ "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" == '' ]; then echo "Missing secret: TEST_ACCOUNT_CLIENT_ID" && exit 1 fi @@ -566,7 +545,6 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} @@ -631,7 +609,6 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} @@ -686,7 +663,6 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} @@ -718,7 +694,6 @@ jobs: AZURE_ENVIRONMENT: ${{ vars.AZURE_ENVIRONMENT }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} @@ -734,7 +709,6 @@ jobs: AZURE_ENVIRONMENT: ${{ vars.AZURE_ENVIRONMENT }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} diff --git a/.github/workflows/register_tre_bundle.yml b/.github/workflows/register_tre_bundle.yml index 189227b..2c6a508 100644 --- a/.github/workflows/register_tre_bundle.yml +++ b/.github/workflows/register_tre_bundle.yml @@ -235,7 +235,6 @@ jobs: ACR_NAME: ${{ secrets.ACR_NAME }} API_CLIENT_ID: "${{ secrets.API_CLIENT_ID }}" AAD_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}" - TEST_APP_ID: "${{ secrets.TEST_APP_ID }}" TEST_ACCOUNT_CLIENT_ID: "${{ secrets.TEST_ACCOUNT_CLIENT_ID }}" TEST_ACCOUNT_CLIENT_SECRET: "${{ secrets.TEST_ACCOUNT_CLIENT_SECRET }}" TRE_ID: ${{ secrets.TRE_ID }} From 46591acdce9a09b18bfbc655a9179e8dc6dad83b Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 10 Sep 2025 15:01:56 +0100 Subject: [PATCH 3/3] Update .github/workflows/deploy_tre_reusable.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/deploy_tre_reusable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml index e7e668b..4ded2e2 100644 --- a/.github/workflows/deploy_tre_reusable.yml +++ b/.github/workflows/deploy_tre_reusable.yml @@ -75,10 +75,10 @@ on: # yamllint disable-line rule:truthy description: "" required: true TEST_ACCOUNT_CLIENT_ID: - description: "" + description: Client ID for test automation account used for unattended bundle registration required: true TEST_ACCOUNT_CLIENT_SECRET: - description: "" + description: Client secret for test automation account used for unattended bundle registration required: true TRE_ID: description: ""