Skip to content

Commit 81ed3a8

Browse files
clean up
1 parent bdca967 commit 81ed3a8

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

.github/workflows/backend-integration-azure-deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
uses: ./.github/workflows/lib-azure-deploy.yml
2424
with:
2525
work-dir: backend-integration
26-
environment: ${{ vars.BACKEND_INTEGRATION_ENV_NAME }}
2726
secrets:
2827
SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
2928
AZURE_CLIENT_ID: ${{ vars.BACKEND_INTEGRATION_CLIENT_ID }}

.github/workflows/lib-azure-deploy.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Deploys to Azure Function App
33
on:
44
workflow_call:
55
inputs:
6-
environment:
7-
required: true
8-
type: string
96
work-dir:
107
required: true
118
type: string
@@ -46,7 +43,7 @@ jobs:
4643
needs: [self-hosted-status]
4744
timeout-minutes: 10
4845
runs-on: ${{ contains(needs.self-hosted-status.outputs.runner-status, 'online') && 'self-hosted' || 'ubuntu-latest' }}
49-
environment: ${{ inputs.environment }}
46+
environment: ${{ secrets.AZURE_ENV_NAME }}
5047
env:
5148
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
5249
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -70,30 +67,13 @@ jobs:
7067
--federated-credential-provider "github" \
7168
--tenant-id "$AZURE_TENANT_ID"
7269
73-
74-
- name: Log in with Azure (Client Credentials)
75-
if: ${{ env.AZURE_CREDENTIALS != '' }}
76-
run: |
77-
$info = $Env:AZURE_CREDENTIALS | ConvertFrom-Json -AsHashtable;
78-
Write-Host "::add-mask::$($info.clientSecret)"
79-
80-
azd auth login \
81-
--client-id "$($info.clientId)" \
82-
--client-secret "$($info.clientSecret)" \
83-
--tenant-id "$($info.tenantId)"
84-
env:
85-
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
86-
8770
# Commented out to preserve existing application settings
8871
# Uncomment when infrastructure changes are needed
8972
#- name: Provision Infrastructure
9073
# run: |
91-
# cd backend-integration
74+
# cd ${{ inputs.work-dir }}
9275
# azd provision --no-prompt
93-
# env:
94-
# AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
95-
# AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
96-
# AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
76+
9777

9878
- name: Deploy Application
9979
run: |

0 commit comments

Comments
 (0)