Skip to content

Commit 3fb72f8

Browse files
AjitPadhi-MicrosoftAjitPadhi-Microsoft
committed
fix: resolve merge conflicts from dev to dependabotchanges (Azure-Samples#2228)
Accept dev versions for all conflicted files including dependencies.
2 parents c4a5fa3 + 178507a commit 3fb72f8

52 files changed

Lines changed: 1222 additions & 2343 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
},
66
"features": {
77
"ghcr.io/devcontainers/features/azure-cli:1": {
8-
"extensions": "ml"
8+
"extensions": "ml",
9+
"installBicep": true,
10+
"version": "latest",
11+
"bicepVersion": "latest"
912
},
1013
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
1114
"ghcr.io/devcontainers/features/node:1": {},

‎.github/workflows/build-docker-images.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ on:
66
- main
77
- dev
88
- demo
9+
paths:
10+
- 'code/**'
11+
- '!code/tests/**'
12+
- 'docker/**'
13+
- 'package.json'
14+
- 'pyproject.toml'
15+
- '.github/workflows/build-docker-images.yml'
16+
- '.github/workflows/build-docker.yml'
917
pull_request:
1018
branches:
1119
- main
@@ -45,7 +53,7 @@ jobs:
4553

4654
- name: Check for relevant changes
4755
id: filter
48-
uses: dorny/paths-filter@v4
56+
uses: dorny/paths-filter@v3
4957
with:
5058
filters: |
5159
docker_related:

‎.github/workflows/build-docker.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Login to Azure via OIDC
2828
if: ${{ inputs.push == true }}
29-
uses: azure/login@v3
29+
uses: azure/login@v2
3030
with:
3131
client-id: ${{ secrets.AZURE_CLIENT_ID }}
3232
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -39,15 +39,15 @@ jobs:
3939
az acr login --name "$REGISTRY_NAME"
4040
4141
- name: Set up Docker Buildx
42-
uses: docker/setup-buildx-action@v4
42+
uses: docker/setup-buildx-action@v3
4343

4444
- name: Get current date
4545
id: date
4646
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
4747

4848
- name: Build Docker Image and optionally push (New Registry)
4949
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
50-
uses: docker/build-push-action@v7
50+
uses: docker/build-push-action@v6
5151
with:
5252
context: .
5353
file: ${{ inputs.dockerfile }}

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ on:
66
- main
77
- dev
88
- demo
9+
paths:
10+
- 'infra/**'
11+
- 'scripts/**'
12+
- 'azure.yaml'
13+
- 'pyproject.toml'
14+
- 'Makefile'
15+
- '.github/workflows/ci.yml'
916
schedule:
1017
- cron: '0 8,20 * * *' # Runs at 8:00 AM and 8:00 PM GMT
1118
workflow_dispatch:
@@ -31,7 +38,7 @@ jobs:
3138

3239
- name: Check for relevant changes
3340
id: filter
34-
uses: dorny/paths-filter@v4
41+
uses: dorny/paths-filter@v3
3542
with:
3643
filters: |
3744
deploy_related:
@@ -69,13 +76,13 @@ jobs:
6976

7077
steps:
7178
- name: Checkout code
72-
uses: actions/checkout@v6
79+
uses: actions/checkout@v5
7380

7481
- name: Install azd
7582
uses: Azure/setup-azd@v2
7683

7784
- name: Login to Azure
78-
uses: azure/login@v3
85+
uses: azure/login@v2
7986
with:
8087
client-id: ${{ secrets.AZURE_CLIENT_ID }}
8188
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -162,7 +169,7 @@ jobs:
162169
echo "Generated SOLUTION_SUFFIX: ${UNIQUE_SOLUTION_SUFFIX}"
163170
164171
- name: Login to GitHub Container Registry
165-
uses: docker/login-action@v4
172+
uses: docker/login-action@v3
166173
with:
167174
registry: ghcr.io
168175
username: ${{ github.repository_owner }}

‎.github/workflows/import-sample-data-cosmosdb.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,82 @@ jobs:
188188
echo "SAMPLE_DATA_DIR=$SAMPLE_DATA_DIR" >> $GITHUB_ENV
189189
echo "✅ Sample data files downloaded to $SAMPLE_DATA_DIR"
190190
191+
- name: Login to Azure for Sample Data Download
192+
uses: azure/login@v2
193+
with:
194+
client-id: ${{ secrets.AZURE_CLIENT_ID }}
195+
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
196+
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
197+
198+
- name: Enable Public Access on Sample Data Storage (if disabled)
199+
id: sample_storage_access
200+
shell: bash
201+
env:
202+
STORAGE_ACCOUNT_NAME: ${{ vars.SAMPLE_DATA_STORAGE_ACCOUNT_NAME }}
203+
run: |
204+
echo "🔍 Checking public network access on sample data storage account '${STORAGE_ACCOUNT_NAME}'..."
205+
206+
# Discover the resource group for the sample data storage account
207+
SAMPLE_STORAGE_RG=$(az storage account list --query "[?name=='${STORAGE_ACCOUNT_NAME}'].resourceGroup | [0]" -o tsv)
208+
if [ -z "$SAMPLE_STORAGE_RG" ] || [ "$SAMPLE_STORAGE_RG" == "null" ]; then
209+
echo "❌ Could not find resource group for storage account '${STORAGE_ACCOUNT_NAME}'."
210+
exit 1
211+
fi
212+
echo "SAMPLE_STORAGE_RG=$SAMPLE_STORAGE_RG" >> $GITHUB_ENV
213+
echo "SAMPLE_STORAGE_RG=$SAMPLE_STORAGE_RG" >> $GITHUB_OUTPUT
214+
215+
CURRENT_ACCESS=$(az storage account show --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --query "publicNetworkAccess" -o tsv)
216+
CURRENT_DEFAULT_ACTION=$(az storage account show --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --query "networkRuleSet.defaultAction" -o tsv)
217+
218+
echo " Current publicNetworkAccess: $CURRENT_ACCESS"
219+
echo " Current defaultAction: $CURRENT_DEFAULT_ACTION"
220+
221+
NEEDS_RESTORE="false"
222+
if [ "$CURRENT_ACCESS" == "Disabled" ] || [ "$CURRENT_DEFAULT_ACTION" == "Deny" ]; then
223+
echo "🔓 Enabling public access on sample data storage account..."
224+
az storage account update --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --public-network-access Enabled --output none
225+
az storage account update --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --default-action Allow --output none
226+
NEEDS_RESTORE="true"
227+
228+
echo "⏳ Waiting 30 seconds for network changes to propagate..."
229+
sleep 30
230+
echo "✅ Public access enabled on sample data storage account."
231+
else
232+
echo "✅ Public access is already enabled."
233+
fi
234+
235+
echo "NEEDS_RESTORE=$NEEDS_RESTORE" >> $GITHUB_ENV
236+
echo "NEEDS_RESTORE=$NEEDS_RESTORE" >> $GITHUB_OUTPUT
237+
echo "ORIGINAL_ACCESS=$CURRENT_ACCESS" >> $GITHUB_ENV
238+
echo "ORIGINAL_DEFAULT_ACTION=$CURRENT_DEFAULT_ACTION" >> $GITHUB_ENV
239+
240+
- name: Download Sample Data from Azure Storage
241+
shell: bash
242+
env:
243+
STORAGE_ACCOUNT_NAME: ${{ vars.SAMPLE_DATA_STORAGE_ACCOUNT_NAME }}
244+
STORAGE_CONTAINER_NAME: ${{ vars.SAMPLE_DATA_STORAGE_CONTAINER_NAME }}
245+
run: |
246+
SAMPLE_DATA_DIR="${RUNNER_TEMP}/sample-data"
247+
mkdir -p "$SAMPLE_DATA_DIR"
248+
249+
echo "📥 Downloading sample data files from storage account '${STORAGE_ACCOUNT_NAME}'..."
250+
az storage blob download \
251+
--account-name "$STORAGE_ACCOUNT_NAME" \
252+
--container-name "$STORAGE_CONTAINER_NAME" \
253+
--name "azure_search_data.json" \
254+
--file "$SAMPLE_DATA_DIR/azure_search_data.json" \
255+
--auth-mode login
256+
257+
az storage blob download \
258+
--account-name "$STORAGE_ACCOUNT_NAME" \
259+
--container-name "$STORAGE_CONTAINER_NAME" \
260+
--name "azure_search_data_UseVectorization_SemanticSearch.json" \
261+
--file "$SAMPLE_DATA_DIR/azure_search_data_UseVectorization_SemanticSearch.json" \
262+
--auth-mode login
263+
264+
echo "SAMPLE_DATA_DIR=$SAMPLE_DATA_DIR" >> $GITHUB_ENV
265+
echo "✅ Sample data files downloaded to $SAMPLE_DATA_DIR"
266+
191267
- name: Validate Workflow Input Parameters
192268
shell: bash
193269
env:

‎.github/workflows/import-sample-data-postgresql.yml‎

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -34,71 +34,10 @@ jobs:
3434
environment: production
3535
steps:
3636
- name: Checkout Code
37-
uses: actions/checkout@v6
37+
uses: actions/checkout@v4
3838

3939
- name: Login to Azure for Sample Data Download
40-
uses: azure/login@v3
41-
with:
42-
client-id: ${{ secrets.AZURE_CLIENT_ID }}
43-
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
44-
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
45-
46-
- name: Enable Public Access on Sample Data Storage (if disabled)
47-
id: sample_storage_access
48-
shell: bash
49-
env:
50-
STORAGE_ACCOUNT_NAME: ${{ vars.SAMPLE_DATA_STORAGE_ACCOUNT_NAME }}
51-
run: |
52-
echo "🔍 Checking public network access on sample data storage account '${STORAGE_ACCOUNT_NAME}'..."
53-
54-
# Discover the resource group for the sample data storage account
55-
SAMPLE_STORAGE_RG=$(az storage account list --query "[?name=='${STORAGE_ACCOUNT_NAME}'].resourceGroup | [0]" -o tsv)
56-
if [ -z "$SAMPLE_STORAGE_RG" ] || [ "$SAMPLE_STORAGE_RG" == "null" ]; then
57-
echo "❌ Could not find resource group for storage account '${STORAGE_ACCOUNT_NAME}'."
58-
exit 1
59-
fi
60-
echo "SAMPLE_STORAGE_RG=$SAMPLE_STORAGE_RG" >> $GITHUB_ENV
61-
62-
CURRENT_ACCESS=$(az storage account show --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --query "publicNetworkAccess" -o tsv)
63-
CURRENT_DEFAULT_ACTION=$(az storage account show --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --query "networkRuleSet.defaultAction" -o tsv)
64-
65-
echo " Current publicNetworkAccess: $CURRENT_ACCESS"
66-
echo " Current defaultAction: $CURRENT_DEFAULT_ACTION"
67-
68-
if [ "$CURRENT_ACCESS" == "Disabled" ] || [ "$CURRENT_DEFAULT_ACTION" == "Deny" ]; then
69-
echo "🔓 Enabling public access on sample data storage account..."
70-
az storage account update --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --public-network-access Enabled --output none
71-
az storage account update --name "$STORAGE_ACCOUNT_NAME" --resource-group "$SAMPLE_STORAGE_RG" --default-action Allow --output none
72-
73-
echo "⏳ Waiting 30 seconds for network changes to propagate..."
74-
sleep 30
75-
echo "✅ Public access enabled on sample data storage account."
76-
else
77-
echo "✅ Public access is already enabled."
78-
fi
79-
80-
- name: Download Sample Data from Azure Storage
81-
shell: bash
82-
env:
83-
STORAGE_ACCOUNT_NAME: ${{ vars.SAMPLE_DATA_STORAGE_ACCOUNT_NAME }}
84-
STORAGE_CONTAINER_NAME: ${{ vars.SAMPLE_DATA_STORAGE_CONTAINER_NAME }}
85-
run: |
86-
SAMPLE_DATA_DIR="${RUNNER_TEMP}/sample-data"
87-
mkdir -p "$SAMPLE_DATA_DIR"
88-
89-
echo "📥 Downloading sample data file from storage account '${STORAGE_ACCOUNT_NAME}'..."
90-
az storage blob download \
91-
--account-name "$STORAGE_ACCOUNT_NAME" \
92-
--container-name "$STORAGE_CONTAINER_NAME" \
93-
--name "exported_data_vector_score.csv" \
94-
--file "$SAMPLE_DATA_DIR/exported_data_vector_score.csv" \
95-
--auth-mode login
96-
97-
echo "SAMPLE_DATA_DIR=$SAMPLE_DATA_DIR" >> $GITHUB_ENV
98-
echo "✅ Sample data file downloaded to $SAMPLE_DATA_DIR"
99-
100-
- name: Login to Azure for Sample Data Download
101-
uses: azure/login@v3
40+
uses: azure/login@v2
10241
with:
10342
client-id: ${{ secrets.AZURE_CLIENT_ID }}
10443
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -200,15 +139,10 @@ jobs:
200139
echo "✅ All input parameters validated successfully!"
201140
202141
- name: Setup Python
203-
uses: actions/setup-python@v6
142+
uses: actions/setup-python@v5
204143
with:
205144
python-version: '3.11'
206145

207-
- name: Upgrade Azure CLI and install extensions
208-
run: |
209-
az upgrade --yes --all
210-
az extension add --name rdbms-connect --upgrade --yes || true
211-
212146
- name: Discover PostgreSQL Server from Resource Group
213147
env:
214148
INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
5454
steps:
5555
- name: Login to Azure
56-
uses: azure/login@v3
56+
uses: azure/login@v2
5757
with:
5858
client-id: ${{ secrets.AZURE_CLIENT_ID }}
5959
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
AZURE_SEARCH_INDEX: ${{ steps.get_output_linux.outputs.AZURE_SEARCH_INDEX }}
8080
steps:
8181
- name: Checkout Code
82-
uses: actions/checkout@v6
82+
uses: actions/checkout@v4
8383

8484
- name: Validate Workflow Input Parameters
8585
shell: bash
@@ -246,7 +246,7 @@ jobs:
246246
uses: Azure/setup-azd@v2
247247

248248
- name: Setup Python
249-
uses: actions/setup-python@v6
249+
uses: actions/setup-python@v5
250250
with:
251251
python-version: '3.11'
252252

@@ -261,7 +261,7 @@ jobs:
261261
262262
- name: Login to AZD
263263
id: login-azure
264-
uses: azure/login@v3
264+
uses: azure/login@v2
265265
with:
266266
client-id: ${{ secrets.AZURE_CLIENT_ID }}
267267
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
AZURE_SEARCH_INDEX: ${{ steps.get_output_windows.outputs.AZURE_SEARCH_INDEX }}
8080
steps:
8181
- name: Checkout Code
82-
uses: actions/checkout@v6
82+
uses: actions/checkout@v4
8383

8484
- name: Validate Workflow Input Parameters
8585
shell: bash
@@ -246,7 +246,7 @@ jobs:
246246
uses: Azure/setup-azd@v2
247247

248248
- name: Setup Python
249-
uses: actions/setup-python@v6
249+
uses: actions/setup-python@v5
250250
with:
251251
python-version: '3.11'
252252

@@ -262,7 +262,7 @@ jobs:
262262
263263
- name: Login to AZD
264264
id: login-azure
265-
uses: azure/login@v3
265+
uses: azure/login@v2
266266
with:
267267
client-id: ${{ secrets.AZURE_CLIENT_ID }}
268268
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
steps:
131131
- name: Checkout Code
132-
uses: actions/checkout@v6
132+
uses: actions/checkout@v4
133133

134134
- name: Validate Workflow Input Parameters
135135
shell: bash
@@ -286,7 +286,7 @@ jobs:
286286
echo "✅ All input parameters validated successfully!"
287287
288288
- name: Login to Azure
289-
uses: azure/login@v3
289+
uses: azure/login@v2
290290
with:
291291
client-id: ${{ secrets.AZURE_CLIENT_ID }}
292292
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

0 commit comments

Comments
 (0)