Skip to content

Commit 0dad538

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
Updated code
1 parent c440078 commit 0dad538

3 files changed

Lines changed: 88 additions & 93 deletions

File tree

‎.github/workflows/job-deploy-linux.yml‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ on:
3030
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
3131
required: false
3232
type: string
33-
CONTAINER_API_APPURL:
34-
required: true
35-
type: string
36-
CONTAINER_API_APPNAME:
37-
required: true
38-
type: string
39-
CONTAINER_WEB_APPNAME:
40-
required: true
41-
type: string
4233
secrets:
4334
AZURE_CLIENT_ID:
4435
required: true
@@ -76,11 +67,18 @@ jobs:
7667
- name: Checkout Code
7768
uses: actions/checkout@v4
7869

79-
- name: Login to Azure
70+
- name: Setup Azure Developer CLI (Linux)
71+
if: runner.os == 'Linux'
72+
shell: bash
73+
run: |
74+
curl -fsSL https://aka.ms/install-azd.sh | sudo bash
75+
azd version
76+
- name: Login to AZD
77+
id: login-azure
8078
shell: bash
8179
run: |
8280
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
83-
az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
81+
azd auth login --client-id ${{ secrets.AZURE_CLIENT_ID }} --client-secret ${{ secrets.AZURE_CLIENT_SECRET }} --tenant-id ${{ secrets.AZURE_TENANT_ID }}
8482
8583
- name: Deploy using azd up and extract values (Linux)
8684
id: get_output_linux
@@ -178,28 +176,62 @@ jobs:
178176
179177
cd src/ContentProcessorAPI/samples/schemas
180178
chmod +x ./register_schema.sh
181-
./register_schema.sh ${{ inputs.CONTAINER_API_APPURL }}/schemavault/ schema_info_sh.json
179+
./register_schema.sh ${{ env.CONTAINER_API_APPURL }}/schemavault/ schema_info_sh.json
182180
183181
- name: Upload sample invoice and claim data (Linux)
184182
shell: bash
185183
run: |
186184
echo "Uploading sample data..."
187185
cd src/ContentProcessorAPI/samples
188186
chmod +x ./upload_files.sh
189-
./upload_files.sh ${{ inputs.CONTAINER_API_APPURL }}/contentprocessor/submit ./invoices '${{ steps.register_linux.outputs.invoice_schema_id }}'
190-
./upload_files.sh ${{ inputs.CONTAINER_API_APPURL }}/contentprocessor/submit ./propertyclaims '${{ steps.register_linux.outputs.propertylossdamageclaimform_schema_id }}'
187+
./upload_files.sh ${{ env.CONTAINER_API_APPURL }}/contentprocessor/submit ./invoices '${{ steps.register_linux.outputs.invoice_schema_id }}'
188+
./upload_files.sh ${{ env.CONTAINER_API_APPURL }}/contentprocessor/submit ./propertyclaims '${{ steps.register_linux.outputs.propertylossdamageclaimform_schema_id }}'
191189
192190
- name: Disable Auth in Web App
193191
shell: bash
194192
run: |
195-
az containerapp update --name ${{ inputs.CONTAINER_WEB_APPNAME }} \
193+
az containerapp update --name ${{ env.CONTAINER_WEB_APPNAME }} \
196194
--resource-group ${{ inputs.RESOURCE_GROUP_NAME }} \
197195
--set-env-vars APP_AUTH_ENABLED=false
198196
199197
- name: Disable Auth in API App
200198
shell: bash
201199
run: |
202200
sleep 30
203-
az containerapp update --name ${{ inputs.CONTAINER_API_APPNAME }} \
201+
az containerapp update --name ${{ env.CONTAINER_API_APPNAME }} \
204202
--resource-group ${{ inputs.RESOURCE_GROUP_NAME }} \
205203
--set-env-vars APP_AUTH_ENABLED=false
204+
205+
- name: Generate Deployment Summary
206+
if: always()
207+
shell: bash
208+
run: |
209+
echo "## 🚀 Deploy Job Summary (Linux)" >> $GITHUB_STEP_SUMMARY
210+
echo "" >> $GITHUB_STEP_SUMMARY
211+
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
212+
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
213+
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
214+
echo "| **Resource Group** | \`${{ inputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
215+
echo "| **Azure Region (Infrastructure)** | \`${{ inputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
216+
echo "| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
217+
echo "| **Docker Image Tag** | \`${{ inputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
218+
echo "| **Environment Name** | \`${{ inputs.ENV_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
219+
echo "" >> $GITHUB_STEP_SUMMARY
220+
if [[ "${{ job.status }}" == "success" ]]; then
221+
echo "### ✅ Deployment Details" >> $GITHUB_STEP_SUMMARY
222+
echo "- **Container Web App URL**: [${{ env.CONTAINER_WEB_APPURL }}](${{ env.CONTAINER_WEB_APPURL }})" >> $GITHUB_STEP_SUMMARY
223+
echo "- **Container API App URL**: [${{ env.CONTAINER_API_APPURL }}](${{ env.CONTAINER_API_APPURL }})" >> $GITHUB_STEP_SUMMARY
224+
echo "- Successfully deployed to Azure with all resources configured" >> $GITHUB_STEP_SUMMARY
225+
echo "- Schemas registered and sample data uploaded successfully" >> $GITHUB_STEP_SUMMARY
226+
else
227+
echo "### ❌ Deployment Failed" >> $GITHUB_STEP_SUMMARY
228+
echo "- Deployment process encountered an error" >> $GITHUB_STEP_SUMMARY
229+
echo "- Check the deployment steps above for detailed error information" >> $GITHUB_STEP_SUMMARY
230+
fi
231+
232+
- name: Logout from Azure
233+
if: always()
234+
shell: bash
235+
run: |
236+
az logout || true
237+
echo "Logged out from Azure."

‎.github/workflows/job-deploy-windows.yml‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ on:
3030
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
3131
required: false
3232
type: string
33-
CONTAINER_API_APPURL:
34-
required: true
35-
type: string
36-
CONTAINER_API_APPNAME:
37-
required: true
38-
type: string
39-
CONTAINER_WEB_APPNAME:
40-
required: true
41-
type: string
4233
secrets:
4334
AZURE_CLIENT_ID:
4435
required: true
@@ -79,11 +70,13 @@ jobs:
7970
- name: Setup Azure Developer CLI (Windows)
8071
uses: Azure/setup-azd@v2
8172

82-
- name: Login to Azure
73+
- name: Login to AZD
74+
id: login-azure
8375
shell: bash
8476
run: |
8577
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
86-
az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
78+
azd auth login --client-id ${{ secrets.AZURE_CLIENT_ID }} --client-secret ${{ secrets.AZURE_CLIENT_SECRET }} --tenant-id ${{ secrets.AZURE_TENANT_ID }}
79+
8780
8881
- name: Deploy using azd up and extract values (Windows)
8982
id: get_output_windows
@@ -192,14 +185,48 @@ jobs:
192185
- name: Disable Auth in Web App
193186
shell: bash
194187
run: |
195-
az containerapp update --name ${{ inputs.CONTAINER_WEB_APPNAME }} \
188+
az containerapp update --name ${{ env.CONTAINER_WEB_APPNAME }} \
196189
--resource-group ${{ inputs.RESOURCE_GROUP_NAME }} \
197190
--set-env-vars APP_AUTH_ENABLED=false
198191
199192
- name: Disable Auth in API App
200193
shell: bash
201194
run: |
202195
sleep 30
203-
az containerapp update --name ${{ inputs.CONTAINER_API_APPNAME }} \
196+
az containerapp update --name ${{ env.CONTAINER_API_APPNAME }} \
204197
--resource-group ${{ inputs.RESOURCE_GROUP_NAME }} \
205198
--set-env-vars APP_AUTH_ENABLED=false
199+
200+
- name: Generate Deployment Summary
201+
if: always()
202+
shell: pwsh
203+
run: |
204+
"## 🚀 Deploy Job Summary (Windows)" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
205+
"" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
206+
"| Field | Value |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
207+
"|-------|--------|" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
208+
"| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
209+
"| **Resource Group** | \`${{ inputs.RESOURCE_GROUP_NAME }}\` |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
210+
"| **Azure Region (Infrastructure)** | \`${{ inputs.AZURE_LOCATION }}\` |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
211+
"| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_OPENAI_LOCATION }}\` |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
212+
"| **Docker Image Tag** | \`${{ inputs.IMAGE_TAG }}\` |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
213+
"| **Environment Name** | \`${{ inputs.ENV_NAME }}\` |" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
214+
"" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
215+
if ("${{ job.status }}" -eq "success") {
216+
"### ✅ Deployment Details" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
217+
"- **Container Web App URL**: [${{ env.CONTAINER_WEB_APPURL }}](${{ env.CONTAINER_WEB_APPURL }})" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
218+
"- **Container API App URL**: [${{ env.CONTAINER_API_APPURL }}](${{ env.CONTAINER_API_APPURL }})" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
219+
"- Successfully deployed to Azure with all resources configured" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
220+
"- Schemas registered and sample data uploaded successfully" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
221+
} else {
222+
"### ❌ Deployment Failed" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
223+
"- Deployment process encountered an error" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
224+
"- Check the deployment steps above for detailed error information" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
225+
}
226+
227+
- name: Logout from Azure
228+
if: always()
229+
shell: bash
230+
run: |
231+
az logout || true
232+
echo "Logged out from Azure."

‎.github/workflows/job-deploy.yml‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,6 @@ jobs:
151151
fi
152152
az --version
153153
154-
- name: Setup Azure Developer CLI (Linux)
155-
if: runner.os == 'Linux'
156-
shell: bash
157-
run: |
158-
curl -fsSL https://aka.ms/install-azd.sh | sudo bash
159-
azd version
160-
161-
- name: Setup Azure Developer CLI (Windows)
162-
if: runner.os == 'Windows'
163-
uses: Azure/setup-azd@v2
164-
165154
- name: Login to Azure
166155
shell: bash
167156
run: |
@@ -355,14 +344,6 @@ jobs:
355344
fi
356345
fi
357346
358-
- name: Set Environment Variables for Child Workflows
359-
id: set_env_vars
360-
shell: bash
361-
run: |
362-
echo "CONTAINER_API_APPURL=" >> $GITHUB_ENV
363-
echo "CONTAINER_API_APPNAME=" >> $GITHUB_ENV
364-
echo "CONTAINER_WEB_APPNAME=" >> $GITHUB_ENV
365-
366347
deploy-linux:
367348
name: Deploy on Linux
368349
needs: azure-setup
@@ -378,9 +359,6 @@ jobs:
378359
EXP: ${{ github.event.inputs.EXP || 'false' }}
379360
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
380361
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
381-
CONTAINER_API_APPURL: ""
382-
CONTAINER_API_APPNAME: ""
383-
CONTAINER_WEB_APPNAME: ""
384362
secrets:
385363
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
386364
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -405,9 +383,6 @@ jobs:
405383
EXP: ${{ github.event.inputs.EXP || 'false' }}
406384
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
407385
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
408-
CONTAINER_API_APPURL: ""
409-
CONTAINER_API_APPNAME: ""
410-
CONTAINER_WEB_APPNAME: ""
411386
secrets:
412387
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
413388
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -416,42 +391,3 @@ jobs:
416391
ACR_TEST_LOGIN_SERVER: ${{ secrets.ACR_TEST_LOGIN_SERVER }}
417392
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
418393
AZURE_ENV_FOUNDRY_PROJECT_ID: ${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_ID }}
419-
420-
summary:
421-
name: Generate Summary
422-
needs: [azure-setup, deploy-linux, deploy-windows]
423-
if: always()
424-
runs-on: ubuntu-latest
425-
steps:
426-
- name: Logout from Azure
427-
shell: bash
428-
run: |
429-
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
430-
az logout
431-
echo "Logged out from Azure."
432-
433-
- name: Generate Deploy Job Summary
434-
shell: bash
435-
run: |
436-
echo "## 🚀 Deploy Job Summary" >> $GITHUB_STEP_SUMMARY
437-
echo "" >> $GITHUB_STEP_SUMMARY
438-
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
439-
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
440-
echo "| **Job Status** | ${{ needs.azure-setup.result == 'success' && (needs.deploy-linux.result == 'success' || needs.deploy-windows.result == 'success') && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
441-
echo "| **Resource Group** | \`${{ needs.azure-setup.outputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
442-
echo "| **Configuration** | ${{ env.WAF_ENABLED == 'true' && 'WAF' || 'Non-WAF' }}+${{ env.EXP == 'true' && 'EXP' || 'Non-EXP' }} |" >> $GITHUB_STEP_SUMMARY
443-
echo "| **Azure Region (Infrastructure)** | \`${{ needs.azure-setup.outputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
444-
echo "| **Azure OpenAI Region** | \`${{ needs.azure-setup.outputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
445-
echo "| **Docker Image Tag** | \`${{ needs.azure-setup.outputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
446-
echo "" >> $GITHUB_STEP_SUMMARY
447-
if [[ "${{ needs.azure-setup.result }}" == "success" ]] && ([[ "${{ needs.deploy-linux.result }}" == "success" ]] || [[ "${{ needs.deploy-windows.result }}" == "success" ]]); then
448-
echo "### ✅ Deployment Details" >> $GITHUB_STEP_SUMMARY
449-
CONTAINER_WEB_APPURL="${{ needs.deploy-linux.outputs.CONTAINER_WEB_APPURL || needs.deploy-windows.outputs.CONTAINER_WEB_APPURL }}"
450-
echo "- **Container Web App URL**: [$CONTAINER_WEB_APPURL]($CONTAINER_WEB_APPURL)" >> $GITHUB_STEP_SUMMARY
451-
echo "- Successfully deployed to Azure with all resources configured" >> $GITHUB_STEP_SUMMARY
452-
echo "- Schemas registered and sample data uploaded successfully" >> $GITHUB_STEP_SUMMARY
453-
else
454-
echo "### ❌ Deployment Failed" >> $GITHUB_STEP_SUMMARY
455-
echo "- Deployment process encountered an error" >> $GITHUB_STEP_SUMMARY
456-
echo "- Check the azure-setup and deploy jobs for detailed error information" >> $GITHUB_STEP_SUMMARY
457-
fi

0 commit comments

Comments
 (0)