Skip to content

Commit

Permalink
Fix review app
Browse files Browse the repository at this point in the history
  • Loading branch information
johnake committed Feb 1, 2024
1 parent 99e76ff commit dea9241
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
uses: marocchino/sticky-pull-request-comment@v2
with:
message: |
AKS review app deployed to ${{ steps.deploy.outputs.environment_url }}
AKS review app deployed to https://find-a-lost-trn-review-pr-${{ github.event.pull_request.number }}.test.teacherservices.cloud
deploy_nonprod:
name: Deploy to ${{ matrix.environment }} environment
Expand Down
43 changes: 22 additions & 21 deletions .github/workflows/delete-review-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
types: [closed]
branches: [main]


jobs:
delete-review-app:
name: Delete Review App ${{ github.event.pull_request.number }}
Expand All @@ -14,35 +15,35 @@ jobs:
environment: review
steps:
- uses: actions/checkout@v4

- name: Extract configuration from tfvars
shell: bash
id: config
run: |
APP_KEY_VAULT=$(jq -r '.app_key_vault' $TFVARS)
NAMESPACE=$(jq -r '.namespace' $TFVARS)
if [ -z "$APP_KEY_VAULT" ]; then
echo "::error ::Failed to extract app_key_vault from $TFVARS"
exit 1
fi
if [ -z "$NAMESPACE" ]; then
echo "::error ::Failed to extract namespace from $TFVARS"
exit 1
fi
echo ::set-output name=app_key_vault::$APP_KEY_VAULT
echo ::set-output name=namespace::$NAMESPACE
shell: bash
env:
TFVARS: workspace_variables/review.tfvars.json
working-directory: terraform/aks
tf_vars_file=terraform/aks/workspace_variables/review.tfvars.json
cat $tf_vars_file
APP_VAULT_NAME=$(jq -r '.app_vault_name' ${tf_vars_file})
NAMESPACE=$(jq -r '.namespace' ${tf_vars_file})
APP_ENVIRONMENT=$(jq -r '.app_environment' ${tf_vars_file})
CLUSTER=$(jq -r '.cluster' ${tf_vars_file})
echo "APP_VAULT_NAME=$APP_VAULT_NAME" >> $GITHUB_ENV
echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
echo "CLUSTER=$CLUSTER" >> $GITHUB_ENV
echo "APP_ENVIRONMENT=$APP_ENVIRONMENT" >> $GITHUB_ENV
- uses: Azure/login@v1
with:
creds: ${{ secrets.azure_credentials }}

- uses: Azure/get-keyvault-secrets@v1
- uses: azure/CLI@v1
id: get_secrets
with:
keyvault: ${{ steps.config.outputs.app_key_vault }}
secrets: "TFSTATE-CONTAINER-ACCESS-KEY,PAAS-USER,PAAS-PASSWORD"
inlineScript: |
TFSTATE_CONTAINER_ACCESS_KEY=$(az keyvault secret show --name "TFSTATE-CONTAINER-ACCESS-KEY" --vault-name "${{ env.APP_VAULT_NAME }}" --query "value" -o tsv)
echo "::add-mask::$TFSTATE_CONTAINER_ACCESS_KEY"
echo "TFSTATE_CONTAINER_ACCESS_KEY=$TFSTATE_CONTAINER_ACCESS_KEY" >> $GITHUB_ENV
echo "::set-output name=TFSTATE_CONTAINER_ACCESS_KEY::$TFSTATE_CONTAINER_ACCESS_KEY"
- uses: hashicorp/setup-terraform@v3
with:
Expand All @@ -56,7 +57,7 @@ jobs:
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
echo "TF_STATE_FILE=$TF_STATE_FILE" >> $GITHUB_ENV
pr_state_file=$(az storage blob list -c faltrn-tfstate \
--account-key ${{ steps.get_secrets.outputs.TFSTATE-CONTAINER-ACCESS-KEY }} \
--account-key ${{ steps.get_secrets.outputs.TFSTATE_CONTAINER_ACCESS_KEY }} \
--account-name "s189t01faltrntfstatervsa" \
--prefix $TF_STATE_FILE --query "[].name" -o tsv)
if [ -n "$pr_state_file" ]; then echo "TF_STATE_EXISTS=true" >> $GITHUB_ENV; fi;
Expand All @@ -79,5 +80,5 @@ jobs:
if: env.TF_STATE_EXISTS == 'true'
run: |
az storage blob delete -c faltrn-tfstate --name ${{ env.TF_STATE_FILE }} \
--account-key ${{ steps.get_secrets.outputs.TFSTATE-CONTAINER-ACCESS-KEY }} \
--account-key ${{ steps.get_secrets.outputs.TFSTATE_CONTAINER_ACCESS_KEY }} \
--account-name "s189t01faltrntfstatervsa"
1 change: 1 addition & 0 deletions terraform/aks/workspace_variables/review.tfvars.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"deploy_azure_backing_services": false,
"enable_postgres_ssl": false,
"inf_vault_name": "s189t01-faltrn-rv-inf-kv",
"app_vault_name": "s189t01-faltrn-rv-app-kv",
"key_vault_resource_group": "s189t01-faltrn-rv-rg"
}

0 comments on commit dea9241

Please sign in to comment.