Merged
Conversation
- Reverted containerRegistryHost to use AZURE_CONTAINER_REGISTRY_HOST - Reverted AI model parameters to use AZURE_AI_MODEL_NAME, AZURE_AI_MODEL_VERSION, AZURE_AI_MODEL_CAPACITY - Reverted deployment type to use AZURE_AI_DEPLOYMENT_TYPE - Removed enableTelemetry parameter customization (uses bicep default) - Updated workflow files and documentation to reflect original naming - Kept AZURE_ENV_ prefix only for: AI_SERVICE_LOCATION, LOG_ANALYTICS_WORKSPACE_RID, FOUNDRY_PROJECT_RID, VM_ADMIN credentials, IMAGETAG
- Changed all workflow inputs from AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID to AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID - Ensures consistency with parameter files and documentation - Affected files: deploy-orchestrator.yml, deploy-v2.yml, job-deploy.yml, job-deploy-linux.yml, job-deploy-windows.yml
…_PROJECT_RID to AZURE_EXISTING_AIPROJECT_RESOURCE_ID and AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID to AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID
…rkflow validation Update validation logic and error messages in deploy-v2.yml, job-deploy-linux.yml, and job-deploy-windows.yml to use the renamed AZURE_EXISTING_AIPROJECT_RESOURCE_ID consistently. Previously, validation referenced the old AI_PROJECT_RESOURCE_ID name causing validation to silently skip. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The uv installer script requires awk for checksum verification. Without it, the build fails with 'checksum mismatch' due to missing awk command on Azure Linux base images. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…n-Solution-Accelerator into psl-prachi-params
- Rename AZURE_AI_DEPLOYMENT_TYPE to AZURE_ENV_MODEL_DEPLOYMENT_TYPE - Rename AZURE_AI_MODEL_NAME to AZURE_ENV_GPT_MODEL_NAME - Rename AZURE_AI_MODEL_VERSION to AZURE_ENV_GPT_MODEL_VERSION - Rename AZURE_AI_MODEL_CAPACITY to AZURE_ENV_GPT_MODEL_CAPACITY - Rename AZURE_ENV_IMAGETAG to AZURE_ENV_IMAGE_TAG - Rename AZURE_CONTAINER_REGISTRY_HOST to AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT Updated files: - Parameter files (main.parameters.json, main.waf.parameters.json) - Documentation (CustomizingAzdParameters.md) - Workflow files (azd-template-validation, azure-dev, job-cleanup-deployment, job-deploy-linux, job-deploy-windows) All changes validated successfully with bicep parameter validation script.
- Revert secrets.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID to secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID - Revert secrets.AZURE_EXISTING_AIPROJECT_RESOURCE_ID to secrets.AZURE_ENV_FOUNDRY_PROJECT_RID These changes ensure workflows use existing GitHub secrets without requiring updates to repository settings. The environment variable names (AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID and AZURE_EXISTING_AIPROJECT_RESOURCE_ID) remain unchanged as intended.
- Changed AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID to AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID - Changed AZURE_ENV_FOUNDRY_PROJECT_RID to AZURE_EXISTING_AIPROJECT_RESOURCE_ID - Ensures secret names match the environment variable names used throughout the codebase
- Rename containerRegistryHost to containerRegistryEndpoint - Rename aiDeploymentType to deploymentType - Rename aiModelName to gptModelName - Rename aiModelVersion to gptModelVersion - Rename aiModelCapacity to gptDeploymentCapacity Updated files: - infra/main.bicep - infra/main_custom.bicep - infra/main.parameters.json - infra/main.waf.parameters.json - infra/main.json (compiled) - .azuredevops/azure-pipeline-infrastructure.yml
- AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID → AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID - AZURE_EXISTING_AIPROJECT_RESOURCE_ID → AZURE_EXISTING_AI_PROJECT_RESOURCE_ID Secret names should not be changed per task requirements.
This reverts commit 859d75d.
…ModelVersion) while adopting latest dev features
fix: Standardization of parameters and update workflows and documentation
fix: install latest bicep via CLI
build: add cosmos in pyproject
fix: blank page issue when process failed
…ent configuration
docs: image update
fix: fixed all copilot comments
chore: Dev merge to main
Roopan-Microsoft
requested review from
Avijit-Microsoft,
Dongbumlee,
Prajwal-Microsoft,
Vinay-Microsoft,
aniaroramsft,
dgp10801,
nchandhi,
sethsteenken and
toherman-msft
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
Downmerges changes from main into the demo branch, aligning infrastructure parameters, CI/CD workflows, and documentation with the latest deployment model (notably updated parameter/env-var names and updated Container Apps configuration).
Changes:
- Renames/realigns infra parameters and corresponding AZD/workflow inputs (e.g., container registry endpoint, AI model/deployment parameters, existing resource IDs).
- Updates deployment workflows and pipelines to use the new parameter names and provisioning behavior.
- Updates runtime behavior and UX pieces (processor dependency update; frontend process-page error details).
Reviewed changes
Copilot reviewed 22 out of 26 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| src/processor/pyproject.toml | Adds azure-cosmos dependency to the processor package set. |
| src/frontend/src/pages/processPage.tsx | Adds richer error-details state to surface failure info during processing. |
| infra/main.waf.parameters.json | Updates parameter placeholders to new env var names for WAF deployments. |
| infra/main.parameters.json | Updates parameter placeholders to new env var names for standard deployments. |
| infra/main.json | Regenerated ARM template reflecting renamed parameters and updated Container Apps config. |
| infra/main.bicep | Renames parameters (registry endpoint, GPT model params) and updates image references accordingly. |
| infra/main_custom.bicep | Mirrors main Bicep parameter renames for the “custom” deployment path. |
| docs/re-use-log-analytics.md | Updates the env var name used for reusing an existing Log Analytics workspace resource ID. |
| docs/re-use-foundry-project.md | Updates the env var name used for reusing an existing Foundry/AI project resource ID. |
| docs/CustomizingAzdParameters.md | Refreshes the parameter table to match new AZD env var names. |
| docs/ConfigureAppAuthentication.md | Updates Entra/App Registration UI navigation steps. |
| .github/workflows/job-deploy.yml | Updates workflow-call inputs/env var names and adds resource-group tagging support. |
| .github/workflows/job-deploy-windows.yml | Aligns Windows deployment workflow with the renamed env vars/parameters. |
| .github/workflows/job-deploy-linux.yml | Aligns Linux deployment workflow with the renamed env vars/parameters. |
| .github/workflows/job-cleanup-deployment.yml | Removes an incorrect AZD env var assignment during cleanup. |
| .github/workflows/deploy-v2.yml | Renames inputs/outputs to match updated env var conventions. |
| .github/workflows/deploy-orchestrator.yml | Renames inputs passed through to deployment jobs. |
| .github/workflows/ci.yml | Removes the now-removed aiDeploymentLocation parameter from CI infra validation. |
| .github/workflows/azure-dev.yml | Updates AZD env var name for AI service location. |
| .github/workflows/azd-template-validation.yml | Updates validation env vars to new AI parameter names. |
| .devcontainer/devcontainer.json | Ensures Azure CLI feature installs Bicep in devcontainer. |
| .azuredevops/azure-pipeline-infrastructure.yml | Renames ACR parameter from host → endpoint and updates parameter passing/logs. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| if [ "$rg_exists" = "false" ]; then | ||
| echo "📦 Resource group does not exist. Creating new resource group '$RESOURCE_GROUP_NAME' in location '$AZURE_LOCATION'..." | ||
| az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION || { echo "❌ Error creating resource group"; exit 1; } | ||
| az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION --tags ${{ env.RG_TAGS }} || { echo "❌ Error creating resource group"; exit 1; } |
Comment on lines
+42595
to
+42596
| "image": "[format('{0}/processor:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]", | ||
| "env": "[concat(createArray(createObject('name', 'APP_CONFIGURATION_URL', 'value', reference('appConfiguration').outputs.endpoint.value), createObject('name', 'AZURE_CLIENT_ID', 'value', reference('appIdentity').outputs.clientId.value), createObject('name', 'AZURE_STORAGE_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value), createObject('name', 'STORAGE_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value), createObject('name', 'CONTROL_API_ENABLED', 'value', '1'), createObject('name', 'CONTROL_API_PORT', 'value', '8080')), if(parameters('enableMonitoring'), createArray(createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference('applicationInsights').outputs.connectionString.value)), createArray()))]", |
Comment on lines
+42610
to
+42612
| "ingressAllowInsecure": { | ||
| "value": true | ||
| }, |
Prajwal-Microsoft
temporarily deployed
to
production
GitHub Actions
Inactive
Prajwal-Microsoft
temporarily deployed
to
production
GitHub Actions
Inactive
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information