Skip to content

Commit 63ef3e7

Browse files
Harmanpreet-MicrosoftHarmanpreet-Microsoft
committed
Merge remote-tracking branch 'origin/dev' into psl-bicep-param
2 parents 2d7a5bd + 0bbd905 commit 63ef3e7

29 files changed

Lines changed: 416 additions & 604 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747
required: false
4848
default: ''
4949
type: string
50-
AZURE_ENV_FOUNDRY_PROJECT_RID:
50+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
5151
description: 'Foundry Project Resource ID (Optional)'
5252
required: false
5353
default: ''
@@ -87,7 +87,7 @@ jobs:
8787
build_docker_image: ${{ inputs.build_docker_image }}
8888
existing_webapp_url: ${{ inputs.existing_webapp_url }}
8989
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
90-
AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
90+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
9191
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
9292
run_e2e_tests: ${{ inputs.run_e2e_tests }}
9393
cleanup_resources: ${{ inputs.cleanup_resources }}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ on:
7575
required: false
7676
default: ''
7777
type: string
78-
AZURE_ENV_FOUNDRY_PROJECT_RID:
78+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
7979
description: 'Foundry Project Resource ID (Optional)'
8080
required: false
8181
default: ''
@@ -103,7 +103,7 @@ jobs:
103103
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
104104
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
105105
azure_env_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_rid }}
106-
azure_env_foundry_project_rid: ${{ steps.validate.outputs.azure_env_foundry_project_rid }}
106+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ steps.validate.outputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
107107
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
108108
steps:
109109
- name: Validate Workflow Input Parameters
@@ -119,7 +119,7 @@ jobs:
119119
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
120120
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
121121
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
122-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ github.event.inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
122+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
123123
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
124124
run: |
125125
echo "🔍 Validating workflow input parameters..."
@@ -223,18 +223,18 @@ jobs:
223223
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
224224
fi
225225
226-
# Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, Azure Resource ID format)
227-
if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
228-
if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
229-
echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
226+
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, Azure Resource ID format)
227+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
228+
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
229+
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
230230
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
231-
echo " Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
231+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
232232
VALIDATION_FAILED=true
233233
else
234-
echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
234+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
235235
fi
236236
else
237-
echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Not provided (optional)"
237+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Not provided (optional)"
238238
fi
239239
240240
# Validate existing_webapp_url (optional, must start with https)
@@ -270,7 +270,7 @@ jobs:
270270
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
271271
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
272272
echo "azure_env_log_analytics_workspace_rid=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
273-
echo "azure_env_foundry_project_rid=$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" >> $GITHUB_OUTPUT
273+
echo "AZURE_EXISTING_AIPROJECT_RESOURCE_ID=$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
274274
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
275275
276276
Run:
@@ -287,7 +287,7 @@ jobs:
287287
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
288288
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
289289
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_rid || '' }}
290-
AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ needs.validate-inputs.outputs.azure_env_foundry_project_rid || '' }}
290+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID || '' }}
291291
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
292292
trigger_type: ${{ github.event_name }}
293293
secrets: inherit

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
3232
required: false
3333
type: string
34-
AZURE_ENV_FOUNDRY_PROJECT_RID:
34+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
3535
required: false
3636
type: string
3737
outputs:
@@ -63,7 +63,7 @@ jobs:
6363
INPUT_EXP: ${{ inputs.EXP }}
6464
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
6565
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
66-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
66+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
6767
run: |
6868
echo "🔍 Validating workflow input parameters..."
6969
VALIDATION_FAILED=false
@@ -162,15 +162,15 @@ jobs:
162162
fi
163163
fi
164164
165-
# Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, if provided must be valid Resource ID)
166-
if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
167-
if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
168-
echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
165+
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
166+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
167+
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
168+
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
169169
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
170-
echo " Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
170+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
171171
VALIDATION_FAILED=true
172172
else
173-
echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
173+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
174174
fi
175175
fi
176176
@@ -224,7 +224,7 @@ jobs:
224224
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
225225
INPUT_EXP: ${{ inputs.EXP }}
226226
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
227-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
227+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
228228
run: |
229229
set -e
230230
@@ -259,16 +259,16 @@ jobs:
259259
EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}"
260260
fi
261261
262-
if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
263-
EXP_AI_PROJECT_ID="$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID"
262+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
263+
EXP_AI_PROJECT_ID="$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID"
264264
else
265-
EXP_AI_PROJECT_ID="${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}"
265+
EXP_AI_PROJECT_ID="${{ secrets.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}"
266266
fi
267267
268268
echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
269-
echo "AZURE_ENV_FOUNDRY_PROJECT_RID: $EXP_AI_PROJECT_ID"
269+
echo "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
270270
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
271-
azd env set AZURE_ENV_FOUNDRY_PROJECT_RID="$EXP_AI_PROJECT_ID"
271+
azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
272272
else
273273
echo "❌ EXP DISABLED - Skipping EXP parameters"
274274
fi

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
3232
required: false
3333
type: string
34-
AZURE_ENV_FOUNDRY_PROJECT_RID:
34+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
3535
required: false
3636
type: string
3737
outputs:
@@ -63,7 +63,7 @@ jobs:
6363
INPUT_EXP: ${{ inputs.EXP }}
6464
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
6565
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
66-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
66+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
6767
run: |
6868
echo "🔍 Validating workflow input parameters..."
6969
VALIDATION_FAILED=false
@@ -162,15 +162,15 @@ jobs:
162162
fi
163163
fi
164164
165-
# Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, if provided must be valid Resource ID)
166-
if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
167-
if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
168-
echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
165+
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
166+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
167+
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
168+
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
169169
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
170-
echo " Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
170+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
171171
VALIDATION_FAILED=true
172172
else
173-
echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
173+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
174174
fi
175175
fi
176176
@@ -225,7 +225,7 @@ jobs:
225225
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
226226
INPUT_EXP: ${{ inputs.EXP }}
227227
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
228-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
228+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
229229
run: |
230230
$ErrorActionPreference = "Stop"
231231
Write-Host "Starting azd deployment..."
@@ -265,16 +265,16 @@ jobs:
265265
$EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}"
266266
}
267267
268-
if ("$env:INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" -ne "") {
269-
$EXP_AI_PROJECT_ID = "$env:INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID"
268+
if ("$env:INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" -ne "") {
269+
$EXP_AI_PROJECT_ID = "$env:INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID"
270270
} else {
271-
$EXP_AI_PROJECT_ID = "${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}"
271+
$EXP_AI_PROJECT_ID = "${{ secrets.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}"
272272
}
273273
274274
Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
275-
Write-Host "AZURE_ENV_FOUNDRY_PROJECT_RID: $EXP_AI_PROJECT_ID"
275+
Write-Host "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
276276
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
277-
azd env set AZURE_ENV_FOUNDRY_PROJECT_RID="$EXP_AI_PROJECT_ID"
277+
azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
278278
} else {
279279
Write-Host "EXP DISABLED - Skipping EXP parameters"
280280
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ on:
5656
required: false
5757
default: ''
5858
type: string
59-
AZURE_ENV_FOUNDRY_PROJECT_RID:
59+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
6060
description: 'Foundry Project Resource ID (Optional)'
6161
required: false
6262
default: ''
@@ -125,7 +125,7 @@ jobs:
125125
INPUT_CLEANUP_RESOURCES: ${{ inputs.cleanup_resources }}
126126
INPUT_RUN_E2E_TESTS: ${{ inputs.run_e2e_tests }}
127127
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
128-
INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
128+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
129129
INPUT_DOCKER_IMAGE_TAG: ${{ inputs.docker_image_tag }}
130130
run: |
131131
echo "🔍 Validating workflow input parameters..."
@@ -201,15 +201,15 @@ jobs:
201201
fi
202202
fi
203203
204-
# Validate AZURE_ENV_FOUNDRY_PROJECT_RID (Azure Resource ID format)
205-
if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
206-
if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
207-
echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
204+
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (Azure Resource ID format)
205+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
206+
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
207+
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
208208
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
209-
echo " Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
209+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
210210
VALIDATION_FAILED=true
211211
else
212-
echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
212+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
213213
fi
214214
fi
215215
@@ -244,7 +244,7 @@ jobs:
244244
env:
245245
INPUT_EXP: ${{ inputs.EXP }}
246246
INPUT_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
247-
INPUT_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
247+
INPUT_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
248248
run: |
249249
echo "🔍 Validating EXP configuration..."
250250
@@ -480,7 +480,7 @@ jobs:
480480
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
481481
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
482482
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
483-
AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
483+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
484484
secrets: inherit
485485

486486
deploy-windows:
@@ -498,5 +498,5 @@ jobs:
498498
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
499499
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
500500
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
501-
AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
501+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
502502
secrets: inherit

0 commit comments

Comments
 (0)