Skip to content

Commit 6d7719d

Browse files
Shreyas-MicrosoftShreyas-Microsoft
committed
AC-2: Down-merge dev into feature branch (psl-sw/41266) for ADO #41266
2 parents cf908f4 + 87fb138 commit 6d7719d

21 files changed

Lines changed: 654 additions & 647 deletions

‎.azuredevops/azure-pipeline-infrastructure.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ parameters:
2222
displayName: Resource Group Name
2323
type: string
2424
default: 'rg-conmig-dev'
25-
- name: containerRegistryHost
26-
displayName: Container Registry Host (exclude https://)
25+
- name: containerRegistryEndpoint
26+
displayName: Container Registry Endpoint (exclude https://)
2727
type: string
2828
default: 'acrcontainermigrationdev.azurecr.io'
2929
- name: tags
@@ -40,7 +40,7 @@ variables:
4040
vmImageName: 'ubuntu-latest'
4141
envName: ${{ parameters.environmentName }}
4242
resourceGroupName: ${{ parameters.resourceGroupName }}
43-
containerRegistryHost: ${{ parameters.containerRegistryHost }}
43+
containerRegistryEndpoint: ${{ parameters.containerRegistryEndpoint }}
4444
tags: ${{ convertToJson(parameters.tags) }}
4545
enableMonitoring: ${{ parameters.enableMonitoring }}
4646

@@ -76,14 +76,14 @@ stages:
7676
--name "deploy.$(envName).$(Build.BuildId)" \
7777
--resource-group $(resourceGroupName) \
7878
--template-file $(Build.SourcesDirectory)/infra/main.bicep \
79-
--parameters solutionName=$(envName) containerRegistryHost='$(containerRegistryHost)' tags='$(tags)' enableMonitoring=$(enableMonitoring) \
79+
--parameters solutionName=$(envName) containerRegistryEndpoint='$(containerRegistryEndpoint)' tags='$(tags)' enableMonitoring=$(enableMonitoring) \
8080
--query "properties.outputs" \
8181
--output json) || {
8282
echo "❌ ERROR: Bicep deployment failed!"
8383
echo "Deployment name: deploy.$(envName).$(Build.BuildId)"
8484
echo "Resource group: $(resourceGroupName)"
8585
echo "Template file: $(Build.SourcesDirectory)/infra/main.bicep"
86-
echo "Parameters: solutionName=$(envName) containerRegistryHost='$(containerRegistryHost)'"
86+
echo "Parameters: solutionName=$(envName) containerRegistryEndpoint='$(containerRegistryEndpoint)'"
8787
8888
# Try to get deployment error details
8989
echo "Attempting to retrieve deployment error details..."

‎.devcontainer/devcontainer.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"features": {
77
"ghcr.io/dhoeric/features/hadolint:1": {},
88
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
9-
"ghcr.io/devcontainers/features/azure-cli:1": {},
9+
"ghcr.io/devcontainers/features/azure-cli:1": {
10+
"installBicep": true,
11+
"version": "latest",
12+
"bicepVersion": "latest"
13+
},
1014
"ghcr.io/azure/azure-dev/azd:latest": {},
1115
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
1216
},

‎.github/workflows/azd-template-validation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
3636
AZURE_ENV_NAME: azd-${{ vars.AZURE_ENV_NAME }}-${{ env.HHMM }}
3737
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
38-
AZURE_AI_SERVICE_LOCATION: ${{ vars.AZURE_LOCATION }}
39-
AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues
38+
AZURE_ENV_AI_SERVICE_LOCATION: ${{ vars.AZURE_LOCATION }}
39+
AZURE_ENV_GPT_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues
4040

4141
- name: print result
4242
run: cat ${{ steps.validation.outputs.resultFile }}

‎.github/workflows/azure-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ jobs:
5252
azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt
5353
fi
5454
azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID"
55-
azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_LOCATION"
55+
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_LOCATION"
5656
azd up --no-prompt

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ jobs:
133133
--template-file infra/main.bicep \
134134
--parameters solutionName=${{env.SOLUTION_PREFIX}} \
135135
--parameters location=${{ env.AZURE_LOCATION }} \
136-
--parameters aiDeploymentLocation=${{ env.AZURE_LOCATION }} \
137136
--parameters azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
138137
--parameters createdBy="pipeline" \
139138

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ on:
3737
required: false
3838
default: false
3939
type: boolean
40-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
40+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
4141
description: 'Log Analytics Workspace ID (Optional)'
4242
required: false
4343
default: ''
4444
type: string
45-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
45+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
4646
description: 'AI Project Resource ID (Optional)'
4747
required: false
4848
default: ''
@@ -81,8 +81,8 @@ jobs:
8181
EXP: ${{ inputs.EXP }}
8282
build_docker_image: ${{ inputs.build_docker_image }}
8383
existing_webapp_url: ${{ inputs.existing_webapp_url }}
84-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
85-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
84+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
85+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
8686
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
8787
cleanup_resources: ${{ inputs.cleanup_resources }}
8888
secrets: inherit

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ on:
8484
default: false
8585
type: boolean
8686

87-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
87+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
8888
description: 'Log Analytics Workspace ID (Optional)'
8989
required: false
9090
default: ''
9191
type: string
92-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
92+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
9393
description: 'AI Project Resource ID (Optional)'
9494
required: false
9595
default: ''
@@ -112,8 +112,8 @@ jobs:
112112
exp: ${{ steps.validate.outputs.exp }}
113113
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
114114
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
115-
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
116-
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
115+
azure_env_existing_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_existing_log_analytics_workspace_rid }}
116+
azure_existing_aiproject_resource_id: ${{ steps.validate.outputs.azure_existing_aiproject_resource_id }}
117117
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
118118
steps:
119119
- name: Validate Workflow Input Parameters
@@ -127,8 +127,8 @@ jobs:
127127
INPUT_EXP: ${{ github.event.inputs.EXP }}
128128
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
129129
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
130-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
131-
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
130+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
131+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
132132
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
133133
run: |
134134
echo "🔍 Validating workflow input parameters..."
@@ -209,32 +209,32 @@ jobs:
209209
echo "✅ cleanup_resources: '$CLEANUP_RESOURCES' is valid"
210210
fi
211211
212-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
213-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
214-
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
215-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID 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_ID'"
217+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
218218
VALIDATION_FAILED=true
219219
else
220-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: 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_ID: Not provided (optional)"
223+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
224224
fi
225225
226-
# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
227-
if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
228-
if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_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_AI_PROJECT_RESOURCE_ID 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_EXISTING_AI_PROJECT_RESOURCE_ID'"
231+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
232232
VALIDATION_FAILED=true
233233
else
234-
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
234+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
235235
fi
236236
else
237-
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: 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)
@@ -268,8 +268,8 @@ jobs:
268268
echo "exp=$EXP_ENABLED" >> $GITHUB_OUTPUT
269269
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
270270
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
271-
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
272-
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
271+
echo "azure_env_existing_log_analytics_workspace_rid=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
272+
echo "azure_existing_aiproject_resource_id=$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
273273
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
274274
275275
Run:
@@ -284,8 +284,8 @@ jobs:
284284
EXP: ${{ needs.validate-inputs.outputs.exp == 'true' }}
285285
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
286286
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
287-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
288-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
287+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_existing_log_analytics_workspace_rid || '' }}
288+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_aiproject_resource_id || '' }}
289289
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
290290
trigger_type: ${{ github.event_name }}
291291
secrets: inherit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
azd env set AZURE_RESOURCE_GROUP "${RESOURCE_GROUP_NAME}"
219219
azd env set AZURE_SUBSCRIPTION_ID "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
220220
azd env set AZURE_LOCATION="${AZURE_LOCATION}"
221-
azd env set AZURE_AI_DEPLOYMENT_TYPE="${AZURE_ENV_OPENAI_LOCATION}"
221+
azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE="${AZURE_ENV_OPENAI_LOCATION}"
222222
fi
223223
224224
- name: Delete deployment using azd

0 commit comments

Comments
 (0)