From e8908e99c1b4ca5e94b743c00f3b2f3753100fa1 Mon Sep 17 00:00:00 2001
From: ebronson68 <111298136+ebronson68@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:45:05 -0500
Subject: [PATCH] [DEVOPS-272] Switch back to default azure login action

---
 .github/workflows/aks-deploy.yaml             |  7 +++----
 .github/workflows/azfunction-deploy.yaml      |  6 +++---
 .github/workflows/b2c-build-and-deploy.yaml   |  5 -----
 .../workflows/clear-azure-redis-cache.yaml    |  7 ++++---
 .github/workflows/next-ci.yaml                | 21 -------------------
 .github/workflows/purge-cdn.yaml              |  7 ++++---
 .github/workflows/ruby-ci.yaml                |  5 -----
 .github/workflows/ui-ci.yaml                  | 20 ------------------
 .../workflows/update-azureapimanagement.yaml  |  8 ++++---
 .github/workflows/update-game-config.yaml     |  5 -----
 10 files changed, 19 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/aks-deploy.yaml b/.github/workflows/aks-deploy.yaml
index f1642886..43ed88b7 100644
--- a/.github/workflows/aks-deploy.yaml
+++ b/.github/workflows/aks-deploy.yaml
@@ -438,11 +438,10 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: false
     steps:
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
+      - name: Login via Az module
+        uses: azure/login@v1
         with:
-          azureCredentials: "${{ secrets.azureCredentials }}"
-          enable-AzPsSession: false
+          creds: "${{ secrets.azureCredentials }}"
 
       - name: Create or Update Public DNS Record
         run: |
diff --git a/.github/workflows/azfunction-deploy.yaml b/.github/workflows/azfunction-deploy.yaml
index 831074c0..528f6f98 100644
--- a/.github/workflows/azfunction-deploy.yaml
+++ b/.github/workflows/azfunction-deploy.yaml
@@ -73,10 +73,10 @@ jobs:
           dotnet build --configuration Release --output ./output
           popd
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
+      - name: Login via Az module
+        uses: azure/login@v1
         with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
+          creds: "${{ secrets.AZURE_CREDENTIALS }}"
 
       - name: Whitelist Boley IPs
         uses: azure/CLI@v1
diff --git a/.github/workflows/b2c-build-and-deploy.yaml b/.github/workflows/b2c-build-and-deploy.yaml
index 067c92f1..ef728158 100644
--- a/.github/workflows/b2c-build-and-deploy.yaml
+++ b/.github/workflows/b2c-build-and-deploy.yaml
@@ -62,11 +62,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.azureCredentials }}"
-
       - name: Generate .env file from Azure Key Vaults
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
diff --git a/.github/workflows/clear-azure-redis-cache.yaml b/.github/workflows/clear-azure-redis-cache.yaml
index 723be869..14a75bd2 100644
--- a/.github/workflows/clear-azure-redis-cache.yaml
+++ b/.github/workflows/clear-azure-redis-cache.yaml
@@ -27,10 +27,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
+      - name: Login via Az module
+        uses: azure/login@v1
         with:
-          azureCredentials: "${{ secrets.azureCredentials }}"
+          creds: "${{ secrets.azureCredentials }}"
+          enable-AzPSSession: true
 
       - name: Install Dependencies
         uses: awalsh128/cache-apt-pkgs-action@v1
diff --git a/.github/workflows/next-ci.yaml b/.github/workflows/next-ci.yaml
index 1e2f3d29..a12baacf 100644
--- a/.github/workflows/next-ci.yaml
+++ b/.github/workflows/next-ci.yaml
@@ -40,11 +40,6 @@ jobs:
           commit_user_email: amu_deploy@amuniversal.com
           commit_message: "[Formatter] Apply prettier changes"
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -66,11 +61,6 @@ jobs:
       - name: Use cache-next-install action
         uses: Andrews-McMeel-Universal/cache-next-install@v1
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -83,7 +73,6 @@ jobs:
       - name: Run Jest tests
         run: yarn test:unit:ci
 
-  # Required status check
   integration-tests:
     name: Integration Tests
     needs: [build]
@@ -98,11 +87,6 @@ jobs:
       - name: Install Playwright Browsers
         run: yarn pretest:integration:ci
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -132,11 +116,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
diff --git a/.github/workflows/purge-cdn.yaml b/.github/workflows/purge-cdn.yaml
index 28939947..4c6aafb8 100644
--- a/.github/workflows/purge-cdn.yaml
+++ b/.github/workflows/purge-cdn.yaml
@@ -38,10 +38,11 @@ jobs:
               exit 1
             }
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
+      - name: Login via Az module
+        uses: azure/login@v1
         with:
-          azureCredentials: "${{ secrets.azureCredentials }}"
+          creds: "${{ secrets.azureCredentials }}"
+          enable-AzPSSession: true
 
       - name: Purge CDN cache
         uses: azure/powershell@v1
diff --git a/.github/workflows/ruby-ci.yaml b/.github/workflows/ruby-ci.yaml
index 4c949041..30f207bf 100644
--- a/.github/workflows/ruby-ci.yaml
+++ b/.github/workflows/ruby-ci.yaml
@@ -37,11 +37,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
diff --git a/.github/workflows/ui-ci.yaml b/.github/workflows/ui-ci.yaml
index fb10bd55..0865f418 100644
--- a/.github/workflows/ui-ci.yaml
+++ b/.github/workflows/ui-ci.yaml
@@ -40,11 +40,6 @@ jobs:
           commit_user_email: amu_deploy@amuniversal.com
           commit_message: "[Formatter] Apply prettier changes"
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -65,11 +60,6 @@ jobs:
       - name: Use cache-yarn-install action
         uses: Andrews-McMeel-Universal/cache-yarn-install@v1
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -96,11 +86,6 @@ jobs:
       - name: Install Playwright Browsers
         run: yarn pretest:integration:ci
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
@@ -130,11 +115,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Use .env cache action
         uses: Andrews-McMeel-Universal/get-envs@v1
         with:
diff --git a/.github/workflows/update-azureapimanagement.yaml b/.github/workflows/update-azureapimanagement.yaml
index 97bc35fa..07f8b040 100644
--- a/.github/workflows/update-azureapimanagement.yaml
+++ b/.github/workflows/update-azureapimanagement.yaml
@@ -73,10 +73,12 @@ jobs:
       azurePassword: ${{ secrets.azurePassword }}
       azureSubscription: ${{ secrets.azureSubscription }}
     steps:
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
+      - name: Login via Az module
+        if: ${{ env.azureCredentials }}
+        uses: azure/login@v1
         with:
-          azureCredentials: "${{ secrets.azureCredentials }}"
+          creds: "${{ secrets.azureCredentials }}"
+          enable-AzPSSession: true
 
       - name: Login via PowerShell
         if: ${{ inputs.azureUser && env.azurePassword && env.azureSubscription }}
diff --git a/.github/workflows/update-game-config.yaml b/.github/workflows/update-game-config.yaml
index 05b2f6bd..37c12094 100644
--- a/.github/workflows/update-game-config.yaml
+++ b/.github/workflows/update-game-config.yaml
@@ -19,11 +19,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to Azure
-        uses: Andrews-McMeel-Universal/cache-azure-login@v1
-        with:
-          azureCredentials: "${{ secrets.AZURE_CREDENTIALS }}"
-
       - name: Generate .env file from Azure Key Vaults
         uses: Andrews-McMeel-Universal/get-envs@v1
         with: