From 5bf86052b80b64f1bcbacb76b6a1eb63b85bdaa7 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@gmail.com>
Date: Fri, 6 Dec 2024 13:21:20 +0100
Subject: [PATCH] dont update redis passwords on migrate for web console
 (#1530)

---
 .github/workflows/aksapply.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/aksapply.yaml b/.github/workflows/aksapply.yaml
index 1a2c1cfe..9ff7bc7c 100644
--- a/.github/workflows/aksapply.yaml
+++ b/.github/workflows/aksapply.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           fetch-depth: '2'
       - name: 'Az login'
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         uses: azure/login@v2
         with:
           client-id: ${{ env.ARM_CLIENT_ID }}
@@ -45,31 +45,31 @@ jobs:
           subscription-id: ${{ env.ARM_SUBSCRIPTION_ID }}
       - name: Get GitHub Public IP
         id: github_public_ip
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
       - name: Add GitHub IP to StorageAccount
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: |
           az storage account network-rule add \
             --resource-group "${{ matrix.target.subscription }}-tfstate" \
             --account-name "${{ matrix.target.subscription }}radixinfra" \
             --ip-address ${{ steps.github_public_ip.outputs.ipv4 }} >/dev/null
       - name: Add GitHub IP to KeyVault
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: |
           az keyvault network-rule add --name "radix-keyv-${{ matrix.target.name }}" \
             --resource-group "common-${{ matrix.target.name }}" \
             --ip-address ${{ steps.github_public_ip.outputs.ipv4 }} >/dev/null
       - name: Lets sleep for 30 seconds for FW rule to complete
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: sleep 30s
       - name: Setup Terraform
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 'latest'
       - name: Terraform Apply
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         id: apply
         env:
           ARM_USE_OIDC: true
@@ -78,14 +78,14 @@ jobs:
           terraform -chdir="./terraform/subscriptions/${{ matrix.target.subscription }}/${{ matrix.target.name }}/pre-clusters" init
           terraform -chdir="./terraform/subscriptions/${{ matrix.target.subscription }}/${{ matrix.target.name }}/pre-clusters" apply -auto-approve
       - name: Revoke GitHub IP on StorageAccount
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: |
           az storage account network-rule remove \
             --resource-group "${{ matrix.target.subscription }}-tfstate" \
             --account-name "${{ matrix.target.subscription }}radixinfra" \
             --ip-address ${{ steps.github_public_ip.outputs.ipv4 }} >/dev/null
       - name: Revoke GitHub IP on KeyVault
-        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply == 'true' }}
+        if: ${{ github.ref == 'refs/heads/master' && inputs.terraformapply }}
         run: |
           az keyvault network-rule remove --name "radix-keyv-${{ matrix.target.name }}" \
             --resource-group "common-${{ matrix.target.name }}" \