From 9b24b00630cc152ea988eca44245875287cd7612 Mon Sep 17 00:00:00 2001
From: Harsh-Microsoft <v-hbangera@microsoft.com>
Date: Thu, 23 Apr 2026 11:17:07 +0000
Subject: [PATCH] ci: Add Azure login refresh steps for WAF deployments in
 Linux and Windows workflows

---
 .github/workflows/job-deploy-linux.yml   | 13 +++++++++++++
 .github/workflows/job-deploy-windows.yml | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
index 0d3aa87ab..6464cf5c0 100644
--- a/.github/workflows/job-deploy-linux.yml
+++ b/.github/workflows/job-deploy-linux.yml
@@ -309,6 +309,19 @@ jobs:
           echo "WEBAPP_URL=$WEBAPP_URL" >> $GITHUB_ENV
           echo "WEBAPP_URL=$WEBAPP_URL" >> $GITHUB_OUTPUT
 
+      - name: Refresh Azure login # token expires for WAF deployments due to long deployment time
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Refresh AZD login # token expires for WAF deployments due to long deployment time
+        shell: bash
+        run: |
+          az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+          azd auth login --client-id "${{ secrets.AZURE_CLIENT_ID }}" --federated-credential-provider "github" --tenant-id "${{ secrets.AZURE_TENANT_ID }}"
+
       - name: Run Post deployment scripts
         env:
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
index d0ba61f31..b8a13ffc5 100644
--- a/.github/workflows/job-deploy-windows.yml
+++ b/.github/workflows/job-deploy-windows.yml
@@ -313,6 +313,19 @@ jobs:
           "WEBAPP_URL=$WEBAPP_URL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           "WEBAPP_URL=$WEBAPP_URL" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
 
+      - name: Refresh Azure login # token expires for WAF deployments due to long deployment time
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Refresh AZD login # token expires for WAF deployments due to long deployment time
+        shell: bash
+        run: |
+          az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+          azd auth login --client-id "${{ secrets.AZURE_CLIENT_ID }}" --federated-credential-provider "github" --tenant-id "${{ secrets.AZURE_TENANT_ID }}"
+
       - name: Run Post deployment scripts
         shell: bash
         env: