Skip to content

Commit 4e543bc

Browse files
PadhiAjit-MicrosoftPadhiAjit-Microsoft
committed
reverted yml changes
1 parent a82c737 commit 4e543bc

6 files changed

Lines changed: 75 additions & 59 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ on:
7474
DATABASE_TYPE:
7575
description: 'Type of database to use'
7676
required: false
77-
default: 'postgresql'
77+
default: 'PostgreSQL'
7878
type: string
7979

8080
env:

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- demo
88
paths:
99
- 'infra/**'
10+
- 'scripts/**'
1011
- 'azure.yaml'
1112
- 'pyproject.toml'
1213
- 'Makefile'
@@ -34,9 +35,9 @@ on:
3435
required: false
3536
type: choice
3637
options:
37-
- 'postgresql'
38-
- 'cosmosdb'
39-
default: 'postgresql'
38+
- 'PostgreSQL'
39+
- 'CosmosDB'
40+
default: 'PostgreSQL'
4041

4142
waf_enabled:
4243
description: 'Deploy WAF'
@@ -202,10 +203,10 @@ jobs:
202203
fi
203204
204205
# Validate DATABASE_TYPE (specific allowed values)
205-
DATABASE_TYPE="${INPUT_DATABASE_TYPE:-postgresql}"
206-
if [[ "$DATABASE_TYPE" != "postgresql" && "$DATABASE_TYPE" != "cosmosdb" ]]; then
207-
echo "❌ ERROR: DATABASE_TYPE must be one of: postgresql, cosmosdb, got: '$DATABASE_TYPE'"
208-
VALIDATION_ERRORS="${VALIDATION_ERRORS}| DATABASE_TYPE | \`$DATABASE_TYPE\` | Must be one of: postgresql, cosmosdb |\n"
206+
DATABASE_TYPE="${INPUT_DATABASE_TYPE:-PostgreSQL}"
207+
if [[ "$DATABASE_TYPE" != "PostgreSQL" && "$DATABASE_TYPE" != "CosmosDB" ]]; then
208+
echo "❌ ERROR: DATABASE_TYPE must be one of: PostgreSQL, CosmosDB, got: '$DATABASE_TYPE'"
209+
VALIDATION_ERRORS="${VALIDATION_ERRORS}| DATABASE_TYPE | \`$DATABASE_TYPE\` | Must be one of: PostgreSQL, CosmosDB |\n"
209210
VALIDATION_FAILED=true
210211
else
211212
echo "✅ DATABASE_TYPE: '$DATABASE_TYPE' is valid"
@@ -405,5 +406,5 @@ jobs:
405406
AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION: ${{ needs.validate-inputs.outputs.azure_search_use_integrated_vectorization || 'false' }}
406407
AZURE_SEARCH_USE_SEMANTIC_SEARCH: ${{ needs.validate-inputs.outputs.azure_search_use_semantic_search || 'false' }}
407408
USE_ADVANCED_IMAGE_PROCESSING: ${{ needs.validate-inputs.outputs.use_advanced_image_processing || 'false' }}
408-
DATABASE_TYPE: ${{ needs.validate-inputs.outputs.database_type || 'postgresql' }}
409+
DATABASE_TYPE: ${{ needs.validate-inputs.outputs.database_type || 'PostgreSQL' }}
409410
secrets: inherit

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

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747
DATABASE_TYPE:
4848
required: false
4949
type: string
50-
default: 'postgresql'
50+
default: 'PostgreSQL'
5151
outputs:
5252
WEB_APPURL:
5353
description: "Container Web App URL"
@@ -217,8 +217,8 @@ jobs:
217217
fi
218218
219219
# Validate DATABASE_TYPE (specific allowed values)
220-
if [[ "$INPUT_DATABASE_TYPE" != "postgresql" && "$INPUT_DATABASE_TYPE" != "cosmosdb" ]]; then
221-
echo "❌ ERROR: DATABASE_TYPE must be one of: postgresql, cosmosdb, got: '$INPUT_DATABASE_TYPE'"
220+
if [[ "$INPUT_DATABASE_TYPE" != "PostgreSQL" && "$INPUT_DATABASE_TYPE" != "CosmosDB" ]]; then
221+
echo "❌ ERROR: DATABASE_TYPE must be one of: PostgreSQL, CosmosDB, got: '$INPUT_DATABASE_TYPE'"
222222
VALIDATION_FAILED=true
223223
else
224224
echo "✅ DATABASE_TYPE: '$INPUT_DATABASE_TYPE' is valid"
@@ -264,8 +264,20 @@ jobs:
264264
265265
- name: Install azd
266266
uses: Azure/setup-azd@v2
267+
268+
- name: Setup Python
269+
uses: actions/setup-python@v5
267270
with:
268-
version: 'stable' # azure.yaml requires >= 1.18.0 != 1.23.9; 'stable' tracks the latest non-preview release
271+
python-version: '3.11'
272+
273+
- name: Install Poetry
274+
shell: bash
275+
run: |
276+
curl -sSL https://install.python-poetry.org | python3 -
277+
echo "$HOME/.local/bin" >> $GITHUB_PATH
278+
sudo ln -sf $HOME/.local/bin/poetry /usr/local/bin/poetry
279+
poetry --version
280+
poetry self add poetry-plugin-export
269281
270282
- name: Login to AZD
271283
id: login-azure
@@ -341,33 +353,32 @@ jobs:
341353
342354
azd env get-values
343355
344-
FRONTEND_WEBSITE_NAME=$(azd env get-value AZURE_FRONTEND_URL)
356+
FRONTEND_WEBSITE_NAME=$(azd env get-value FRONTEND_WEBSITE_NAME)
345357
echo "FRONTEND_WEBSITE_NAME=$FRONTEND_WEBSITE_NAME" >> $GITHUB_OUTPUT
346-
ADMIN_WEBSITE_NAME=$(azd env get-value AZURE_FRONTEND_URL)
358+
ADMIN_WEBSITE_NAME=$(azd env get-value ADMIN_WEBSITE_NAME)
347359
echo "ADMIN_WEBSITE_NAME=$ADMIN_WEBSITE_NAME" >> $GITHUB_OUTPUT
348360
349361
# Export values based on DATABASE_TYPE
350-
if [[ "$INPUT_DATABASE_TYPE" == "postgresql" ]]; then
351-
AZURE_POSTGRESQL_HOST_NAME=$(azd env get-value AZURE_POSTGRES_HOST)
362+
if [[ "$INPUT_DATABASE_TYPE" == "PostgreSQL" ]]; then
363+
AZURE_POSTGRESQL_HOST_NAME=$(azd env get-value AZURE_POSTGRESQL_HOST_NAME)
352364
echo "AZURE_POSTGRESQL_HOST_NAME=$AZURE_POSTGRESQL_HOST_NAME" >> $GITHUB_OUTPUT
353-
elif [[ "$INPUT_DATABASE_TYPE" == "cosmosdb" ]]; then
354-
AZURE_SEARCH_SERVICE=$(azd env get-value AZURE_AI_SEARCH_NAME)
365+
elif [[ "$INPUT_DATABASE_TYPE" == "CosmosDB" ]]; then
366+
AZURE_SEARCH_SERVICE=$(azd env get-value AZURE_SEARCH_SERVICE)
355367
echo "AZURE_SEARCH_SERVICE=$AZURE_SEARCH_SERVICE" >> $GITHUB_OUTPUT
356368
357-
AZURE_BLOB_ACCOUNT_NAME=$(azd env get-value AZURE_STORAGE_ACCOUNT_NAME)
369+
AZURE_BLOB_ACCOUNT_NAME=$(azd env get-value AZURE_BLOB_ACCOUNT_NAME)
358370
echo "AZURE_BLOB_ACCOUNT_NAME=$AZURE_BLOB_ACCOUNT_NAME" >> $GITHUB_OUTPUT
359371
360-
AZURE_SEARCH_INDEX=$(azd env get-value AZURE_AI_SEARCH_INDEX)
372+
AZURE_SEARCH_INDEX=$(azd env get-value AZURE_SEARCH_INDEX)
361373
echo "AZURE_SEARCH_INDEX=$AZURE_SEARCH_INDEX" >> $GITHUB_OUTPUT
362374
fi
363375
364376
- name: Disable Authentication with Script
365-
continue-on-error: true
366377
run: |
367-
export FRONTEND_WEBSITE_URL=$(azd env get-value AZURE_FRONTEND_URL)
368-
export ADMIN_WEBSITE_URL=$(azd env get-value AZURE_FRONTEND_URL)
369-
chmod +x infra/scripts/post-provision/disable_auth.sh 2>/dev/null || true
370-
[ -f infra/scripts/post-provision/disable_auth.sh ] && ./infra/scripts/post-provision/disable_auth.sh || echo "disable_auth.sh not found; skipping auth disable"
378+
export FRONTEND_WEBSITE_URL=$(azd env get-value FRONTEND_WEBSITE_NAME)
379+
export ADMIN_WEBSITE_URL=$(azd env get-value ADMIN_WEBSITE_NAME)
380+
chmod +x scripts/disable_auth.sh
381+
./scripts/disable_auth.sh
371382
372383
- name: Generate Deploy Job Summary
373384
if: always()

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

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747
DATABASE_TYPE:
4848
required: false
4949
type: string
50-
default: 'postgresql'
50+
default: 'PostgreSQL'
5151
outputs:
5252
WEB_APPURL:
5353
description: "Container Web App URL"
@@ -217,8 +217,8 @@ jobs:
217217
fi
218218
219219
# Validate DATABASE_TYPE (specific allowed values)
220-
if [[ "$INPUT_DATABASE_TYPE" != "postgresql" && "$INPUT_DATABASE_TYPE" != "cosmosdb" ]]; then
221-
echo "❌ ERROR: DATABASE_TYPE must be one of: postgresql, cosmosdb, got: '$INPUT_DATABASE_TYPE'"
220+
if [[ "$INPUT_DATABASE_TYPE" != "PostgreSQL" && "$INPUT_DATABASE_TYPE" != "CosmosDB" ]]; then
221+
echo "❌ ERROR: DATABASE_TYPE must be one of: PostgreSQL, CosmosDB, got: '$INPUT_DATABASE_TYPE'"
222222
VALIDATION_FAILED=true
223223
else
224224
echo "✅ DATABASE_TYPE: '$INPUT_DATABASE_TYPE' is valid"
@@ -264,8 +264,21 @@ jobs:
264264
265265
- name: Install azd
266266
uses: Azure/setup-azd@v2
267+
268+
- name: Setup Python
269+
uses: actions/setup-python@v5
267270
with:
268-
version: 'stable' # azure.yaml requires >= 1.18.0 != 1.23.9; 'stable' tracks the latest non-preview release
271+
python-version: '3.11'
272+
273+
- name: Install Poetry
274+
shell: pwsh
275+
run: |
276+
(Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | python -
277+
$poetryPath = "$env:APPDATA\Python\Scripts"
278+
echo "$poetryPath" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
279+
$env:Path = "$poetryPath;$env:Path"
280+
poetry --version
281+
poetry self add poetry-plugin-export
269282
270283
- name: Login to AZD
271284
id: login-azure
@@ -341,35 +354,34 @@ jobs:
341354
342355
azd env get-values
343356
344-
$FrontendWebsiteName = azd env get-value AZURE_FRONTEND_URL
357+
$FrontendWebsiteName = azd env get-value FRONTEND_WEBSITE_NAME
345358
echo "FRONTEND_WEBSITE_NAME=$FrontendWebsiteName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
346359
347-
$AdminWebsiteName = azd env get-value AZURE_FRONTEND_URL
360+
$AdminWebsiteName = azd env get-value ADMIN_WEBSITE_NAME
348361
echo "ADMIN_WEBSITE_NAME=$AdminWebsiteName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
349362
350363
# Export values based on DATABASE_TYPE
351-
if ($env:INPUT_DATABASE_TYPE -eq 'postgresql') {
352-
$PostgresqlHostName = azd env get-value AZURE_POSTGRES_HOST
364+
if ($env:INPUT_DATABASE_TYPE -eq 'PostgreSQL') {
365+
$PostgresqlHostName = azd env get-value AZURE_POSTGRESQL_HOST_NAME
353366
echo "AZURE_POSTGRESQL_HOST_NAME=$PostgresqlHostName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
354-
} elseif ($env:INPUT_DATABASE_TYPE -eq 'cosmosdb') {
355-
$SearchService = azd env get-value AZURE_AI_SEARCH_NAME
367+
} elseif ($env:INPUT_DATABASE_TYPE -eq 'CosmosDB') {
368+
$SearchService = azd env get-value AZURE_SEARCH_SERVICE
356369
echo "AZURE_SEARCH_SERVICE=$SearchService" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
357370
358-
$BlobAccountName = azd env get-value AZURE_STORAGE_ACCOUNT_NAME
371+
$BlobAccountName = azd env get-value AZURE_BLOB_ACCOUNT_NAME
359372
echo "AZURE_BLOB_ACCOUNT_NAME=$BlobAccountName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
360373
361-
$SearchIndex = azd env get-value AZURE_AI_SEARCH_INDEX
374+
$SearchIndex = azd env get-value AZURE_SEARCH_INDEX
362375
echo "AZURE_SEARCH_INDEX=$SearchIndex" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
363376
}
364377
365378
- name: Disable Authentication with Script
366-
continue-on-error: true
367379
shell: bash
368380
run: |
369-
export FRONTEND_WEBSITE_URL=$(azd env get-value AZURE_FRONTEND_URL)
370-
export ADMIN_WEBSITE_URL=$(azd env get-value AZURE_FRONTEND_URL)
371-
chmod +x infra/scripts/post-provision/disable_auth.sh 2>/dev/null || true
372-
[ -f infra/scripts/post-provision/disable_auth.sh ] && ./infra/scripts/post-provision/disable_auth.sh || echo "disable_auth.sh not found; skipping auth disable"
381+
export FRONTEND_WEBSITE_URL=$(azd env get-value FRONTEND_WEBSITE_NAME)
382+
export ADMIN_WEBSITE_URL=$(azd env get-value ADMIN_WEBSITE_NAME)
383+
chmod +x scripts/disable_auth.sh
384+
./scripts/disable_auth.sh
373385
374386
- name: Generate Deploy Job Summary
375387
if: always()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ on:
6969
DATABASE_TYPE:
7070
description: 'Type of database to use'
7171
required: false
72-
default: 'postgresql'
72+
default: 'PostgreSQL'
7373
type: string
7474
outputs:
7575
RESOURCE_GROUP_NAME:
@@ -172,14 +172,14 @@ jobs:
172172
173173
# Validate DATABASE_TYPE (specific allowed values)
174174
if [[ -n "$INPUT_DATABASE_TYPE" ]]; then
175-
if [[ "$INPUT_DATABASE_TYPE" != "postgresql" && "$INPUT_DATABASE_TYPE" != "cosmosdb" ]]; then
176-
echo "❌ ERROR: DATABASE_TYPE must be one of: postgresql, cosmosdb, got: '$INPUT_DATABASE_TYPE'"
175+
if [[ "$INPUT_DATABASE_TYPE" != "PostgreSQL" && "$INPUT_DATABASE_TYPE" != "CosmosDB" ]]; then
176+
echo "❌ ERROR: DATABASE_TYPE must be one of: PostgreSQL, CosmosDB, got: '$INPUT_DATABASE_TYPE'"
177177
VALIDATION_FAILED=true
178178
else
179179
echo "✅ DATABASE_TYPE: '$INPUT_DATABASE_TYPE' is valid"
180180
fi
181181
else
182-
echo "✅ DATABASE_TYPE: Not provided (will use default 'postgresql')"
182+
echo "✅ DATABASE_TYPE: Not provided (will use default 'PostgreSQL')"
183183
fi
184184
185185
# Validate waf_enabled (boolean)
@@ -584,7 +584,7 @@ jobs:
584584
needs: [azure-setup, deploy-linux, deploy-windows, post-deployment-setup]
585585
if: |
586586
always() &&
587-
inputs.DATABASE_TYPE == 'postgresql' &&
587+
inputs.DATABASE_TYPE == 'PostgreSQL' &&
588588
(needs.deploy-linux.result == 'success' || needs.deploy-windows.result == 'success') &&
589589
needs.post-deployment-setup.result == 'success'
590590
uses: ./.github/workflows/import-sample-data-postgresql.yml
@@ -598,7 +598,7 @@ jobs:
598598
needs: [azure-setup, deploy-linux, deploy-windows, post-deployment-setup]
599599
if: |
600600
always() &&
601-
inputs.DATABASE_TYPE == 'cosmosdb' &&
601+
inputs.DATABASE_TYPE == 'CosmosDB' &&
602602
(needs.deploy-linux.result == 'success' || needs.deploy-windows.result == 'success') &&
603603
needs.post-deployment-setup.result == 'success'
604604
uses: ./.github/workflows/import-sample-data-cosmosdb.yml

‎.github/workflows/job-post-deployment-setup.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,13 @@ jobs:
4343
run: |
4444
pip install psycopg2-binary azure-identity
4545
46-
- name: Build, Push, and Update Container Images
47-
shell: bash
48-
env:
49-
RESOURCE_GROUP: ${{ inputs.RESOURCE_GROUP_NAME }}
50-
run: |
51-
chmod +x infra/scripts/post-provision/acr_build_push_update.sh
52-
bash infra/scripts/post-provision/acr_build_push_update.sh -g "$RESOURCE_GROUP"
53-
5446
- name: Run Post-Deployment Setup
5547
shell: bash
5648
env:
5749
RESOURCE_GROUP: ${{ inputs.RESOURCE_GROUP_NAME }}
5850
run: |
59-
chmod +x infra/scripts/post-provision/post_deployment_setup.sh
60-
bash infra/scripts/post-provision/post_deployment_setup.sh "$RESOURCE_GROUP"
51+
chmod +x scripts/post_deployment_setup.sh
52+
bash scripts/post_deployment_setup.sh "$RESOURCE_GROUP"
6153
6254
- name: Generate Post-Deployment Summary
6355
if: always()

0 commit comments

Comments
 (0)