Skip to content

Commit

Permalink
[DEVOPS-272] Switch back to default Azure login action to avoid cachi…
Browse files Browse the repository at this point in the history
…ng issues (#60)

<details open>
<summary><a href="https://amuniversal.atlassian.net/browse/DEVOPS-272"
title="DEVOPS-272" target="_blank">DEVOPS-272</a></summary>
  <br />
  <table>
    <tr>
      <th>Summary</th>
<td>Switch back to the default Azure Login GitHub action in the reusable
workflows</td>
    </tr>
    <tr>
      <th>Type</th>
      <td>
<img alt="Story"
src="https://amuniversal.atlassian.net/images/icons/issuetypes/story.png"
/>
        Story
      </td>
    </tr>
    <tr>
      <th>Status</th>
      <td>In Progress</td>
    </tr>
    <tr>
      <th>Points</th>
      <td>N/A</td>
    </tr>
    <tr>
      <th>Labels</th>
      <td>-</td>
    </tr>
  </table>
</details>
<!--
do not remove this marker as it will break action-jira-linter's
functionality.
  added_by_jira_lint
-->
---

<!--
We appreciate the effort for this pull request but before that please
make sure you read the contribution guidelines, then fill out the blanks
below.

Please format the PR title appropriately based on the type of change:
  [<issue>]: <description>
Where <issue> is the related Jira Issue Key.
-->

## Description

- Switch back to default azure login action where applicable. In other
cases, just remove it if `get-envs` action is run since it already logs
in to Azure.

## Related Issues

<!-- List any related Jira issues here -->

- Jira Issue: DEVOPS-272
  • Loading branch information
ebronson68 committed Oct 4, 2023
1 parent a966b4d commit 7fe1131
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 72 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/aks-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/azfunction-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/b2c-build-and-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/clear-azure-redis-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/next-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -83,7 +73,6 @@ jobs:
- name: Run Jest tests
run: yarn test:unit:ci

# Required status check
integration-tests:
name: Integration Tests
needs: [build]
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/purge-cdn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/ruby-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/ui-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/update-azureapimanagement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/update-game-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7fe1131

Please sign in to comment.