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

Remove unused vars from workflows #74

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Remove unused vars from workflows #74

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58f1190
Remove unused vars from workflows
t-young31 Jun 6, 2023
887e970
Skip shellcheck for evaluating error code
marrobi Jun 28, 2023
5b62260
Add quotes to fix linting
marrobi Jun 28, 2023
d8a98bc
Add quotes on exit ec
marrobi Jun 28, 2023
21468cc
Merge branch 'main' into remove_unused_vars_from_workflows
marrobi Dec 22, 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
12 changes: 0 additions & 12 deletions .github/actions/devcontainer_run_command/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,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
Expand Down Expand Up @@ -211,9 +202,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 }} \
Expand Down
30 changes: 2 additions & 28 deletions .github/workflows/deploy_tre_reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,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
Expand Down Expand Up @@ -141,15 +129,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
Expand Down Expand Up @@ -240,10 +219,10 @@ jobs:
run: |
# shellcheck disable=SC2034,SC2015,SC2125
for i in {1..3}; do
az acr login --name "${{ secrets.CI_CACHE_ACR_NAME }}" && ec=0 && break || ec=\$? && sleep 10
az acr login --name "${{ secrets.CI_CACHE_ACR_NAME }}" && ec=0 && break || ec=$? && sleep 10
done
# shellcheck disable=SC2242
(exit \$ec)
(exit $ec)

- name: Push cached devcontainer
run: docker image push ${{ env.CI_CACHE_ACR_URI }}/tredev:${{ inputs.DEVCONTAINER_TAG }}
Expand Down Expand Up @@ -505,7 +484,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 }}
Expand Down Expand Up @@ -563,7 +541,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 }}
Expand Down Expand Up @@ -613,7 +590,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 }}
Expand Down Expand Up @@ -645,7 +621,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 }}
Expand All @@ -661,7 +636,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 }}
Expand Down