Skip to content

Commit 64332ee

Browse files
Vamshi-MicrosoftVamshi-Microsoft
authored
Merge pull request #5 from Vamshi-Microsoft/vk-removeconfig
Vk removeconfig
2 parents 1c8a1ad + 984bd06 commit 64332ee

8 files changed

Lines changed: 103 additions & 358 deletions

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

Lines changed: 7 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Reusable Deployment Workflow
1+
name: Deployment orchestrator v2
22

33
on:
44
workflow_call:
@@ -61,69 +61,21 @@ on:
6161
description: 'Trigger type (workflow_dispatch, pull_request, schedule)'
6262
required: true
6363
type: string
64-
secrets:
65-
AZURE_CLIENT_ID:
66-
required: true
67-
AZURE_CLIENT_SECRET:
68-
required: true
69-
AZURE_TENANT_ID:
70-
required: true
71-
AZURE_SUBSCRIPTION_ID:
72-
required: true
73-
ACR_TEST_LOGIN_SERVER:
74-
required: true
75-
ACR_TEST_USERNAME:
76-
required: true
77-
ACR_TEST_PASSWORD:
78-
required: true
79-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
80-
required: false
81-
AZURE_ENV_FOUNDRY_PROJECT_ID:
82-
required: false
83-
EMAILNOTIFICATION_LOGICAPP_URL_TA:
84-
required: false
85-
outputs:
86-
CONTAINER_WEB_APPURL:
87-
description: "Container Web App URL"
88-
value: ${{ jobs.deploy.outputs.CONTAINER_WEB_APPURL }}
89-
RESOURCE_GROUP_NAME:
90-
description: "Resource Group Name"
91-
value: ${{ jobs.deploy.outputs.RESOURCE_GROUP_NAME }}
9264

9365
env:
9466
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
9567

9668
jobs:
97-
display-configuration:
98-
uses: ./.github/workflows/job-display-configuration.yml
99-
with:
100-
trigger_type: ${{ inputs.trigger_type }}
101-
runner_os: ${{ inputs.runner_os }}
102-
waf_enabled: ${{ inputs.waf_enabled }}
103-
EXP: ${{ inputs.EXP }}
104-
build_docker_image: ${{ inputs.build_docker_image }}
105-
cleanup_resources: ${{ inputs.cleanup_resources }}
106-
run_e2e_tests: ${{ inputs.run_e2e_tests }}
107-
azure_location: ${{ inputs.azure_location }}
108-
resource_group_name: ${{ inputs.resource_group_name }}
109-
existing_webapp_url: ${{ inputs.existing_webapp_url }}
110-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
111-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
112-
11369
docker-build:
114-
needs: display-configuration
11570
uses: ./.github/workflows/job-docker-build.yml
11671
with:
11772
trigger_type: ${{ inputs.trigger_type }}
11873
build_docker_image: ${{ inputs.build_docker_image }}
119-
secrets:
120-
ACR_TEST_LOGIN_SERVER: ${{ secrets.ACR_TEST_LOGIN_SERVER }}
121-
ACR_TEST_USERNAME: ${{ secrets.ACR_TEST_USERNAME }}
122-
ACR_TEST_PASSWORD: ${{ secrets.ACR_TEST_PASSWORD }}
74+
secrets: inherit
12375

12476
deploy:
12577
if: always() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)
126-
needs: [display-configuration, docker-build]
78+
needs: docker-build
12779
uses: ./.github/workflows/job-deploy.yml
12880
with:
12981
trigger_type: ${{ inputs.trigger_type }}
@@ -137,14 +89,8 @@ jobs:
13789
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
13890
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
13991
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
140-
secrets:
141-
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
142-
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
143-
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
144-
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
145-
ACR_TEST_LOGIN_SERVER: ${{ secrets.ACR_TEST_LOGIN_SERVER }}
146-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
147-
AZURE_ENV_FOUNDRY_PROJECT_ID: ${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_ID }}
92+
run_e2e_tests: ${{ inputs.run_e2e_tests }}
93+
secrets: inherit
14894

14995
e2e-test:
15096
if: always() && ((needs.deploy.result == 'success' && needs.deploy.outputs.CONTAINER_WEB_APPURL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))
@@ -172,8 +118,7 @@ jobs:
172118
QUOTA_FAILED: ${{ needs.deploy.outputs.QUOTA_FAILED }}
173119
TEST_SUCCESS: ${{ needs.e2e-test.outputs.TEST_SUCCESS }}
174120
TEST_REPORT_URL: ${{ needs.e2e-test.outputs.TEST_REPORT_URL }}
175-
secrets:
176-
EMAILNOTIFICATION_LOGICAPP_URL_TA: ${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}
121+
secrets: inherit
177122

178123
cleanup-deployment:
179124
if: always() && needs.deploy.result == 'success' && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources == true || inputs.cleanup_resources == null)
@@ -189,8 +134,4 @@ jobs:
189134
AZURE_ENV_OPENAI_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
190135
ENV_NAME: ${{ needs.deploy.outputs.ENV_NAME }}
191136
IMAGE_TAG: ${{ needs.deploy.outputs.IMAGE_TAG }}
192-
secrets:
193-
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
194-
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
195-
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
196-
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
137+
secrets: inherit

‎.github/workflows/job-cleanup-deployment.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Cleanup Deployment Job
1+
name: Cleanup Deployment Job v2
22

33
on:
44
workflow_call:
@@ -41,15 +41,6 @@ on:
4141
description: 'Docker Image Tag'
4242
required: true
4343
type: string
44-
secrets:
45-
AZURE_CLIENT_ID:
46-
required: true
47-
AZURE_CLIENT_SECRET:
48-
required: true
49-
AZURE_TENANT_ID:
50-
required: true
51-
AZURE_SUBSCRIPTION_ID:
52-
required: true
5344

5445
jobs:
5546
cleanup-deployment:
@@ -109,7 +100,7 @@ jobs:
109100
echo "" >> $GITHUB_STEP_SUMMARY
110101
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
111102
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
112-
echo "| **Resouce Group deletion Status** | ${{ steps.delete_rg.outcome == 'success' && '✅ Initiated' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
103+
echo "| **Resource Group deletion Status** | ${{ steps.delete_rg.outcome == 'success' && '✅ Initiated' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
113104
echo "| **Resource Group** | \`${{ env.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
114105
echo "" >> $GITHUB_STEP_SUMMARY
115106
if [[ "${{ steps.delete_rg.outcome }}" == "success" ]]; then

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

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy Steps - Linux
1+
name: Deploy Steps - Linux v2
22

33
on:
44
workflow_call:
@@ -24,49 +24,42 @@ on:
2424
EXP:
2525
required: true
2626
type: string
27+
WAF_ENABLED:
28+
required: false
29+
type: string
30+
default: 'false'
2731
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
2832
required: false
2933
type: string
3034
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
3135
required: false
3236
type: string
33-
secrets:
34-
AZURE_CLIENT_ID:
35-
required: true
36-
AZURE_CLIENT_SECRET:
37-
required: true
38-
AZURE_TENANT_ID:
39-
required: true
40-
AZURE_SUBSCRIPTION_ID:
41-
required: true
42-
ACR_TEST_LOGIN_SERVER:
43-
required: true
44-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
45-
required: false
46-
AZURE_ENV_FOUNDRY_PROJECT_ID:
47-
required: false
4837
outputs:
4938
CONTAINER_WEB_APPURL:
5039
description: "Container Web App URL"
5140
value: ${{ jobs.deploy-linux.outputs.CONTAINER_WEB_APPURL }}
52-
invoice_schema_id:
53-
description: "Invoice Schema ID"
54-
value: ${{ jobs.deploy-linux.outputs.invoice_schema_id }}
55-
propertydamageclaimform_schema_id:
56-
description: "Property Damage Claim Form Schema ID"
57-
value: ${{ jobs.deploy-linux.outputs.propertydamageclaimform_schema_id }}
5841

5942
jobs:
6043
deploy-linux:
6144
runs-on: ubuntu-latest
45+
env:
46+
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
6247
outputs:
6348
CONTAINER_WEB_APPURL: ${{ steps.get_output_linux.outputs.CONTAINER_WEB_APPURL }}
64-
invoice_schema_id: ${{ steps.register_linux.outputs.invoice_schema_id }}
65-
propertydamageclaimform_schema_id: ${{ steps.register_linux.outputs.propertylossdamageclaimform_schema_id }}
6649
steps:
6750
- name: Checkout Code
6851
uses: actions/checkout@v4
6952

53+
- name: Configure Parameters Based on WAF Setting
54+
shell: bash
55+
run: |
56+
if [[ "${{ inputs.WAF_ENABLED }}" == "true" ]]; then
57+
cp infra/main.waf.parameters.json infra/main.parameters.json
58+
echo "✅ Successfully copied WAF parameters to main parameters file"
59+
else
60+
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
61+
fi
62+
7063
- name: Setup Azure CLI
7164
shell: bash
7265
run: |
@@ -91,7 +84,7 @@ jobs:
9184
id: get_output_linux
9285
shell: bash
9386
run: |
94-
set -e
87+
set -e
9588
echo "Starting azd deployment..."
9689
echo "EXP: ${{ inputs.EXP }}"
9790
echo "Using Docker Image Tag: ${{ inputs.IMAGE_TAG }}"
@@ -219,10 +212,10 @@ jobs:
219212
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
220213
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
221214
echo "| **Resource Group** | \`${{ inputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
215+
echo "| **Configuration Type** | \`${{ inputs.WAF_ENABLED == 'true' && inputs.EXP == 'true' && 'WAF + EXP' || inputs.WAF_ENABLED == 'true' && inputs.EXP != 'true' && 'WAF + Non-EXP' || inputs.WAF_ENABLED != 'true' && inputs.EXP == 'true' && 'Non-WAF + EXP' || 'Non-WAF + Non-EXP' }}\` |" >> $GITHUB_STEP_SUMMARY
222216
echo "| **Azure Region (Infrastructure)** | \`${{ inputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
223217
echo "| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
224218
echo "| **Docker Image Tag** | \`${{ inputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
225-
echo "| **Environment Name** | \`${{ inputs.ENV_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
226219
echo "" >> $GITHUB_STEP_SUMMARY
227220
if [[ "${{ job.status }}" == "success" ]]; then
228221
echo "### ✅ Deployment Details" >> $GITHUB_STEP_SUMMARY

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

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy Steps - Windows
1+
name: Deploy Steps - Windows v2
22

33
on:
44
workflow_call:
@@ -24,49 +24,42 @@ on:
2424
EXP:
2525
required: true
2626
type: string
27+
WAF_ENABLED:
28+
required: false
29+
type: string
30+
default: 'false'
2731
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
2832
required: false
2933
type: string
3034
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
3135
required: false
3236
type: string
33-
secrets:
34-
AZURE_CLIENT_ID:
35-
required: true
36-
AZURE_CLIENT_SECRET:
37-
required: true
38-
AZURE_TENANT_ID:
39-
required: true
40-
AZURE_SUBSCRIPTION_ID:
41-
required: true
42-
ACR_TEST_LOGIN_SERVER:
43-
required: true
44-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
45-
required: false
46-
AZURE_ENV_FOUNDRY_PROJECT_ID:
47-
required: false
4837
outputs:
4938
CONTAINER_WEB_APPURL:
5039
description: "Container Web App URL"
5140
value: ${{ jobs.deploy-windows.outputs.CONTAINER_WEB_APPURL }}
52-
invoice_schema_id:
53-
description: "Invoice Schema ID"
54-
value: ${{ jobs.deploy-windows.outputs.invoice_schema_id }}
55-
propertydamageclaimform_schema_id:
56-
description: "Property Damage Claim Form Schema ID"
57-
value: ${{ jobs.deploy-windows.outputs.propertydamageclaimform_schema_id }}
5841

5942
jobs:
6043
deploy-windows:
6144
runs-on: windows-latest
45+
env:
46+
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
6247
outputs:
6348
CONTAINER_WEB_APPURL: ${{ steps.get_output_windows.outputs.CONTAINER_WEB_APPURL }}
64-
invoice_schema_id: ${{ steps.register_windows.outputs.invoice_schema_id }}
65-
propertydamageclaimform_schema_id: ${{ steps.register_windows.outputs.propertylossdamageclaimform_schema_id }}
6649
steps:
6750
- name: Checkout Code
6851
uses: actions/checkout@v4
6952

53+
- name: Configure Parameters Based on WAF Setting
54+
shell: bash
55+
run: |
56+
if [[ "${{ inputs.WAF_ENABLED }}" == "true" ]]; then
57+
cp infra/main.waf.parameters.json infra/main.parameters.json
58+
echo "✅ Successfully copied WAF parameters to main parameters file"
59+
else
60+
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
61+
fi
62+
7063
- name: Setup Azure Developer CLI (Windows)
7164
uses: Azure/setup-azd@v2
7265

@@ -207,6 +200,7 @@ jobs:
207200
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
208201
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
209202
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
203+
echo "| **Configuration Type** | \`${{ inputs.WAF_ENABLED == 'true' && inputs.EXP == 'true' && 'WAF + EXP' || inputs.WAF_ENABLED == 'true' && inputs.EXP != 'true' && 'WAF + Non-EXP' || inputs.WAF_ENABLED != 'true' && inputs.EXP == 'true' && 'Non-WAF + EXP' || 'Non-WAF + Non-EXP' }}\` |" >> $GITHUB_STEP_SUMMARY
210204
echo "| **Resource Group** | \`${{ inputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
211205
echo "| **Azure Region (Infrastructure)** | \`${{ inputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
212206
echo "| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)