Fix review app

DFE-Digital · Feb 1, 2024 · 12ed521 · 12ed521
1 parent 99e76ff
commit 12ed521
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -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

diff --git a/.github/workflows/delete-review-app.yml b/.github/workflows/delete-review-app.yml
@@ -14,35 +14,34 @@ 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_OUTPUT
 
       - uses: hashicorp/setup-terraform@v3
         with:

diff --git a/terraform/aks/workspace_variables/review.tfvars.json b/terraform/aks/workspace_variables/review.tfvars.json
@@ -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"
 }