fix: merging dev to main#456
Open
Priyanka1-Microsoft wants to merge 17 commits into
Open
Conversation
…to use GUID format
fix: update GPT model version to 2024-11-20 across configuration files
ci: Refactor Docker workflow
chore: Updated Dependabot security packages
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request merges a set of deployment/workflow, infrastructure template, and documentation updates into main, primarily to standardize deployment defaults (model version, RBAC role IDs) and improve consistency/security around Azure Container Registry usage in GitHub Actions.
Changes:
- Updated default GPT model version to
2024-11-20across Bicep/ARM templates and documentation. - Switched RBAC role assignments from role names to explicit Azure role definition IDs in the infra templates.
- Refactored GitHub Actions Docker build/deploy workflows to use repository variables for ACR endpoints, and updated frontend dependencies/overrides and lockfile accordingly.
Reviewed changes
Copilot reviewed 9 out of 10 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/frontend/package.json | Bumps axios/react-router-dom and adds dependency overrides (including brace-expansion). |
| src/frontend/package-lock.json | Regenerates lockfile to reflect updated dependencies (axios and related transitive deps). |
| infra/main.json | Updates generated ARM template metadata, default GPT model version, and role definition identifiers. |
| infra/main.bicep | Updates default GPT model version and switches role assignments to explicit role definition IDs. |
| infra/main_custom.bicep | Mirrors main.bicep updates for custom deployments (model version + role definition IDs). |
| docs/CustomizingAzdParameters.md | Updates documented default GPT model version and fixes the Log Analytics link path. |
| .github/workflows/job-docker-build.yml | Simplifies reusable Docker build workflow and standardizes ACR usage via vars.ACR_TEST_LOGIN_SERVER. |
| .github/workflows/job-deploy-windows.yml | Uses vars.ACR_TEST_LOGIN_SERVER when setting ACR endpoint for deployments. |
| .github/workflows/job-deploy-linux.yml | Uses vars.ACR_TEST_LOGIN_SERVER when setting ACR endpoint for deployments. |
| .github/workflows/deploy-orchestrator.yml | Moves Docker-build gating logic to the orchestrator and removes now-unneeded inputs passed to the reusable build workflow. |
Files not reviewed (1)
- src/frontend/package-lock.json: Generated file
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
fix: merging main to dev
chore: update azure.yaml to show github issue URL
Comment on lines
+8
to
+9
| workflow_dispatch: | ||
|
|
fix: fix upload bug
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
This pull request introduces several important updates across the deployment workflows, infrastructure templates, and documentation. The main highlights are the upgrade of the default GPT model version, improved security and consistency in Azure Container Registry (ACR) usage, and explicit role assignments using Azure role definition IDs. Additionally, some documentation and dependency updates are included.
Infrastructure and Model Version Updates:
2024-11-20in Bicep templates (infra/main.bicep,infra/main_custom.bicep), ARM template (infra/main.json), and documentation (docs/CustomizingAzdParameters.md). [1] [2] [3] [4]Workflow and Deployment Improvements:
${{ vars.ACR_TEST_LOGIN_SERVER }}instead of secrets for ACR references, and improved the Docker build job for clarity and security. [1] [2] [3] [4] [5] [6]job-docker-build.yml, streamlining manual trigger and permissions. [1] [2]Dependency and Documentation Updates:
axiosdependency in the frontend to version1.17.0.CustomizingAzdParameters.md.Template and Metadata Updates:
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information