Skip to content

Commit 7fe662b

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #603 from microsoft/revert-576-feature/standardize-parameter-names
fix: Update parameter names for standardization"
2 parents 4cce192 + 65bb07a commit 7fe662b

12 files changed

Lines changed: 101 additions & 101 deletions

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
--parameters \
206206
solutionName="${{ env.SOLUTION_PREFIX }}" \
207207
location=${{ env.AZURE_LOCATION }} \
208-
azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
208+
aiDeploymentsLocation=${{ env.AZURE_LOCATION }} \
209209
gptModelDeploymentType="GlobalStandard" \
210210
gptModelName="gpt-4.1-mini" \
211211
gptModelCapacity=${{ env.GPT_CAPACITY }} \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
required: false
3434
default: 'GoldenPath-Testing'
3535
type: string
36-
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
36+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
3737
description: 'Log Analytics Workspace ID (Optional)'
3838
required: false
3939
default: ''
@@ -62,7 +62,7 @@ jobs:
6262
waf_enabled: ${{ inputs.waf_enabled }}
6363
EXP: ${{ inputs.EXP }}
6464
existing_webapp_url: ${{ inputs.existing_webapp_url }}
65-
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
65+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
6666
run_e2e_tests: ${{ inputs.run_e2e_tests }}
6767
cleanup_resources: ${{ inputs.cleanup_resources }}
6868
secrets: inherit
@@ -86,7 +86,7 @@ jobs:
8686
existing_webapp_url: ${{ inputs.existing_webapp_url }}
8787
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
8888
AZURE_LOCATION: ${{ needs.deploy.outputs.AZURE_LOCATION }}
89-
AZURE_ENV_AI_SERVICE_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
89+
AZURE_ENV_OPENAI_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
9090
ENV_NAME: ${{ needs.deploy.outputs.ENV_NAME }}
9191
IMAGE_TAG: ${{ needs.deploy.outputs.IMAGE_TAG }}
9292
secrets: inherit

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ on:
5757
- 'Smoke-Testing'
5858
- 'None'
5959

60-
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
60+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
6161
description: 'Log Analytics Workspace ID (Optional)'
6262
required: false
6363
default: ''
@@ -85,7 +85,7 @@ jobs:
8585
exp: ${{ steps.validate.outputs.exp }}
8686
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
8787
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
88-
azure_env_existing_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_existing_log_analytics_workspace_rid }}
88+
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
8989
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
9090

9191
steps:
@@ -99,7 +99,7 @@ jobs:
9999
INPUT_EXP: ${{ github.event.inputs.EXP }}
100100
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
101101
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
102-
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
102+
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
103103
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
104104

105105
run: |
@@ -167,18 +167,18 @@ jobs:
167167
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
168168
fi
169169
170-
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
171-
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
172-
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
173-
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
170+
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
171+
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
172+
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
173+
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
174174
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
175-
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
175+
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
176176
VALIDATION_FAILED=true
177177
else
178-
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
178+
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
179179
fi
180180
else
181-
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
181+
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
182182
fi
183183
184184
# Validate existing_webapp_url (optional, must start with https)
@@ -211,7 +211,7 @@ jobs:
211211
echo "exp=$EXP_ENABLED" >> $GITHUB_OUTPUT
212212
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
213213
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
214-
echo "azure_env_existing_log_analytics_workspace_rid=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
214+
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
215215
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
216216
217217
Run:
@@ -225,7 +225,7 @@ jobs:
225225
EXP: ${{ needs.validate-inputs.outputs.exp == 'true' }}
226226
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
227227
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
228-
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_existing_log_analytics_workspace_rid || '' }}
228+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
229229
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
230230
trigger_type: ${{ github.event_name }}
231231
secrets: inherit

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
description: 'Azure Location'
2525
required: true
2626
type: string
27-
AZURE_ENV_AI_SERVICE_LOCATION:
27+
AZURE_ENV_OPENAI_LOCATION:
2828
description: 'Azure OpenAI Location'
2929
required: true
3030
type: string
@@ -45,7 +45,7 @@ jobs:
4545
env:
4646
RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
4747
AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
48-
AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
48+
AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
4949
ENV_NAME: ${{ inputs.ENV_NAME }}
5050
IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
5151
steps:
@@ -57,7 +57,7 @@ jobs:
5757
INPUT_EXISTING_WEBAPP_URL: ${{ inputs.existing_webapp_url }}
5858
INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
5959
INPUT_AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
60-
INPUT_AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
60+
INPUT_AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
6161
INPUT_ENV_NAME: ${{ inputs.ENV_NAME }}
6262
INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
6363
run: |
@@ -108,12 +108,12 @@ jobs:
108108
VALIDATION_FAILED=true
109109
fi
110110
111-
# Validate AZURE_ENV_AI_SERVICE_LOCATION (required - Azure region format)
112-
if [[ -z "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" ]]; then
113-
echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION is required but was not provided"
111+
# Validate AZURE_ENV_OPENAI_LOCATION (required - Azure region format)
112+
if [[ -z "$INPUT_AZURE_ENV_OPENAI_LOCATION" ]]; then
113+
echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION is required but was not provided"
114114
VALIDATION_FAILED=true
115-
elif [[ ! "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" =~ ^[a-z0-9]+$ ]]; then
116-
echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is invalid. Must contain only lowercase letters and numbers"
115+
elif [[ ! "$INPUT_AZURE_ENV_OPENAI_LOCATION" =~ ^[a-z0-9]+$ ]]; then
116+
echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION '$INPUT_AZURE_ENV_OPENAI_LOCATION' is invalid. Must contain only lowercase letters and numbers"
117117
VALIDATION_FAILED=true
118118
fi
119119

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
ENV_NAME:
77
required: true
88
type: string
9-
AZURE_ENV_AI_SERVICE_LOCATION:
9+
AZURE_ENV_OPENAI_LOCATION:
1010
required: true
1111
type: string
1212
AZURE_LOCATION:
@@ -25,7 +25,7 @@ on:
2525
required: false
2626
type: string
2727
default: 'false'
28-
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
28+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
2929
required: false
3030
type: string
3131
outputs:
@@ -46,13 +46,13 @@ jobs:
4646
shell: bash
4747
env:
4848
INPUT_ENV_NAME: ${{ inputs.ENV_NAME }}
49-
INPUT_AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
49+
INPUT_AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
5050
INPUT_AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
5151
INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
5252
INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
5353
INPUT_EXP: ${{ inputs.EXP }}
5454
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
55-
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
55+
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
5656
run: |
5757
echo "🔍 Validating workflow input parameters..."
5858
VALIDATION_FAILED=false
@@ -68,15 +68,15 @@ jobs:
6868
echo "✅ ENV_NAME: '$INPUT_ENV_NAME' is valid"
6969
fi
7070
71-
# Validate AZURE_ENV_AI_SERVICE_LOCATION (required - Azure region format)
72-
if [[ -z "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" ]]; then
73-
echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION is required but was not provided"
71+
# Validate AZURE_ENV_OPENAI_LOCATION (required - Azure region format)
72+
if [[ -z "$INPUT_AZURE_ENV_OPENAI_LOCATION" ]]; then
73+
echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION is required but was not provided"
7474
VALIDATION_FAILED=true
75-
elif [[ ! "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" =~ ^[a-z0-9]+$ ]]; then
76-
echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is invalid. Must contain only lowercase letters and numbers (e.g., 'australiaeast', 'westus2')"
75+
elif [[ ! "$INPUT_AZURE_ENV_OPENAI_LOCATION" =~ ^[a-z0-9]+$ ]]; then
76+
echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION '$INPUT_AZURE_ENV_OPENAI_LOCATION' is invalid. Must contain only lowercase letters and numbers (e.g., 'australiaeast', 'westus2')"
7777
VALIDATION_FAILED=true
7878
else
79-
echo "✅ AZURE_ENV_AI_SERVICE_LOCATION: '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is valid"
79+
echo "✅ AZURE_ENV_OPENAI_LOCATION: '$INPUT_AZURE_ENV_OPENAI_LOCATION' is valid"
8080
fi
8181
8282
# Validate AZURE_LOCATION (required - Azure region format)
@@ -134,15 +134,15 @@ jobs:
134134
echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
135135
fi
136136
137-
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional - Azure Resource ID format)
138-
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
139-
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
140-
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
137+
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional - Azure Resource ID format)
138+
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
139+
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
140+
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
141141
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
142-
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
142+
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
143143
VALIDATION_FAILED=true
144144
else
145-
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
145+
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
146146
fi
147147
fi
148148
@@ -238,40 +238,40 @@ jobs:
238238
shell: pwsh
239239
env:
240240
INPUT_ENV_NAME: ${{ inputs.ENV_NAME }}
241-
INPUT_AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
241+
INPUT_AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
242242
INPUT_AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
243243
INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
244244
INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
245245
INPUT_EXP: ${{ inputs.EXP }}
246-
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
246+
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
247247
run: |
248248
# Create azd environment
249249
azd env new $env:INPUT_ENV_NAME --no-prompt
250250
251251
# Set environment variables
252252
azd config set defaults.subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
253253
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
254-
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:INPUT_AZURE_ENV_AI_SERVICE_LOCATION"
254+
azd env set AZURE_ENV_OPENAI_LOCATION="$env:INPUT_AZURE_ENV_OPENAI_LOCATION"
255255
azd env set AZURE_LOCATION="$env:INPUT_AZURE_LOCATION"
256256
azd env set AZURE_RESOURCE_GROUP="$env:INPUT_RESOURCE_GROUP_NAME"
257257
azd env set AZURE_ENV_IMAGE_TAG="$env:INPUT_IMAGE_TAG"
258258
259259
# Set AI model capacity parameters
260-
azd env set AZURE_ENV_GPT_MODEL_CAPACITY="150"
261-
azd env set AZURE_ENV_EMBEDDING_DEPLOYMENT_CAPACITY="200"
260+
azd env set AZURE_ENV_MODEL_CAPACITY="150"
261+
azd env set AZURE_ENV_EMBEDDING_MODEL_CAPACITY="200"
262262
263263
if ($env:INPUT_EXP -eq "true") {
264264
Write-Host "✅ EXP ENABLED - Setting EXP parameters..."
265265
266266
# Set EXP variables dynamically
267-
if ($env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID -ne "") {
268-
$EXP_LOG_ANALYTICS_ID = $env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID
267+
if ($env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID -ne "") {
268+
$EXP_LOG_ANALYTICS_ID = $env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID
269269
} else {
270-
$EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}"
270+
$EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
271271
}
272272
273-
Write-Host "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
274-
azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
273+
Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID"
274+
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="$EXP_LOG_ANALYTICS_ID"
275275
} else {
276276
Write-Host "❌ EXP DISABLED - Skipping EXP parameters"
277277
}
@@ -438,7 +438,7 @@ jobs:
438438
echo "| **Resource Group** | \`${{ inputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
439439
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
440440
echo "| **Azure Region (Infrastructure)** | \`${{ inputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
441-
echo "| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
441+
echo "| **Azure OpenAI Region** | \`${{ inputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
442442
echo "| **Docker Image Tag** | \`${{ inputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
443443
echo "" >> $GITHUB_STEP_SUMMARY
444444
if [[ "${{ job.status }}" == "success" ]]; then

0 commit comments

Comments
 (0)