Skip to content

Commit 760c6fe

Browse files
Harmanpreet-MicrosoftHarmanpreet-Microsoft
committed
refactor: rename log analytics workspace resource ID variable to existing log analytics workspace resource ID across workflows
1 parent 69d02f6 commit 760c6fe

5 files changed

Lines changed: 51 additions & 51 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on:
4242
required: false
4343
default: 'GoldenPath-Testing'
4444
type: string
45-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
45+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
4646
description: 'Log Analytics Workspace Resource ID (Optional)'
4747
required: false
4848
default: ''
@@ -86,7 +86,7 @@ jobs:
8686
EXP: ${{ inputs.EXP }}
8787
build_docker_image: ${{ inputs.build_docker_image }}
8888
existing_webapp_url: ${{ inputs.existing_webapp_url }}
89-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
89+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
9090
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 }}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ on:
7070
- 'GoldenPath-Testing'
7171
- 'Smoke-Testing'
7272
- 'None'
73-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
73+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
7474
description: 'Log Analytics Workspace Resource ID (Optional)'
7575
required: false
7676
default: ''
@@ -102,7 +102,7 @@ jobs:
102102
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
103103
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
104104
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
105-
azure_env_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_rid }}
105+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ steps.validate.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
106106
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:
@@ -118,7 +118,7 @@ jobs:
118118
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
119119
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
120120
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
121-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
121+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
122122
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: |
@@ -209,18 +209,18 @@ jobs:
209209
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
210210
fi
211211
212-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
213-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
214-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
215-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
212+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
213+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
214+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
215+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
216216
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
217-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
217+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
218218
VALIDATION_FAILED=true
219219
else
220-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
220+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
221221
fi
222222
else
223-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
223+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
224224
fi
225225
226226
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, Azure Resource ID format)
@@ -269,7 +269,7 @@ jobs:
269269
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
270270
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
271271
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
272-
echo "azure_env_log_analytics_workspace_rid=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
272+
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
273273
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
@@ -286,7 +286,7 @@ jobs:
286286
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
287287
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
288288
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
289-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_rid || '' }}
289+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID || '' }}
290290
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 }}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
required: false
2929
type: string
3030
default: 'false'
31-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
31+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
3232
required: false
3333
type: string
3434
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
@@ -62,7 +62,7 @@ jobs:
6262
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
6363
INPUT_EXP: ${{ inputs.EXP }}
6464
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
65-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
65+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
6666
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
6767
run: |
6868
echo "🔍 Validating workflow input parameters..."
@@ -150,15 +150,15 @@ jobs:
150150
echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
151151
fi
152152
153-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
154-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
155-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
156-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
153+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
154+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
155+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
156+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
157157
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
158-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
158+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
159159
VALIDATION_FAILED=true
160160
else
161-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
161+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
162162
fi
163163
fi
164164
@@ -223,7 +223,7 @@ jobs:
223223
INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
224224
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
225225
INPUT_EXP: ${{ inputs.EXP }}
226-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
226+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
227227
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
228228
run: |
229229
set -e
@@ -253,8 +253,8 @@ jobs:
253253
if [[ "$INPUT_EXP" == "true" ]]; then
254254
echo "✅ EXP ENABLED - Setting EXP parameters..."
255255
256-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
257-
EXP_LOG_ANALYTICS_ID="$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID"
256+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
257+
EXP_LOG_ANALYTICS_ID="$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID"
258258
else
259259
EXP_LOG_ANALYTICS_ID="${{ vars.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
260260
fi
@@ -265,9 +265,9 @@ jobs:
265265
EXP_AI_PROJECT_ID="${{ vars.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
266266
fi
267267
268-
echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
268+
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
269269
echo "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
270-
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
270+
azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
271271
azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
272272
else
273273
echo "❌ EXP DISABLED - Skipping EXP parameters"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
required: false
2929
type: string
3030
default: 'false'
31-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
31+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
3232
required: false
3333
type: string
3434
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
@@ -62,7 +62,7 @@ jobs:
6262
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
6363
INPUT_EXP: ${{ inputs.EXP }}
6464
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
65-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
65+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
6666
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
6767
run: |
6868
echo "🔍 Validating workflow input parameters..."
@@ -150,15 +150,15 @@ jobs:
150150
echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
151151
fi
152152
153-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
154-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
155-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
156-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
153+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
154+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
155+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
156+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
157157
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
158-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
158+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
159159
VALIDATION_FAILED=true
160160
else
161-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
161+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
162162
fi
163163
fi
164164
@@ -224,7 +224,7 @@ jobs:
224224
INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
225225
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
226226
INPUT_EXP: ${{ inputs.EXP }}
227-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
227+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
228228
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
229229
run: |
230230
$ErrorActionPreference = "Stop"
@@ -259,8 +259,8 @@ jobs:
259259
Write-Host "EXP ENABLED ✅ - Setting EXP parameters..."
260260
261261
# Set EXP variables dynamically
262-
if ("$env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" -ne "") {
263-
$EXP_LOG_ANALYTICS_ID = "$env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID"
262+
if ("$env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" -ne "") {
263+
$EXP_LOG_ANALYTICS_ID = "$env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID"
264264
} else {
265265
$EXP_LOG_ANALYTICS_ID = "${{ vars.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
266266
}
@@ -271,9 +271,9 @@ jobs:
271271
$EXP_AI_PROJECT_ID = "${{ vars.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
272272
}
273273
274-
Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
274+
Write-Host "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
275275
Write-Host "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
276-
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
276+
azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
277277
azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
278278
} else {
279279
Write-Host "EXP DISABLED - Skipping EXP parameters"

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ on:
5151
required: false
5252
default: ''
5353
type: string
54-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
54+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
5555
description: 'Log Analytics Workspace Resource ID (Optional)'
5656
required: false
5757
default: ''
@@ -124,7 +124,7 @@ jobs:
124124
INPUT_WAF_ENABLED: ${{ inputs.waf_enabled }}
125125
INPUT_CLEANUP_RESOURCES: ${{ inputs.cleanup_resources }}
126126
INPUT_RUN_E2E_TESTS: ${{ inputs.run_e2e_tests }}
127-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
127+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
128128
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
129129
INPUT_DOCKER_IMAGE_TAG: ${{ inputs.docker_image_tag }}
130130
run: |
@@ -189,15 +189,15 @@ jobs:
189189
fi
190190
fi
191191
192-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (Azure Resource ID format)
193-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
194-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
195-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
192+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (Azure Resource ID format)
193+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
194+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
195+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
196196
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
197-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
197+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
198198
VALIDATION_FAILED=true
199199
else
200-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
200+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
201201
fi
202202
fi
203203
@@ -243,7 +243,7 @@ jobs:
243243
shell: bash
244244
env:
245245
INPUT_EXP: ${{ inputs.EXP }}
246-
INPUT_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
246+
INPUT_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
247247
INPUT_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
248248
run: |
249249
echo "🔍 Validating EXP configuration..."
@@ -479,7 +479,7 @@ jobs:
479479
BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
480480
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
481481
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
482-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
482+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
483483
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
484484
secrets: inherit
485485

@@ -497,6 +497,6 @@ jobs:
497497
BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
498498
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
499499
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
500-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
500+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
501501
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
502502
secrets: inherit

0 commit comments

Comments
 (0)