Skip to content

fix: merging dev to main#456

Open
Priyanka1-Microsoft wants to merge 17 commits into
mainfrom
dev
Open

fix: merging dev to main#456
Priyanka1-Microsoft wants to merge 17 commits into
mainfrom
dev

Conversation

@Priyanka1-Microsoft

Copy link
Copy Markdown

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:

  • Updated the default GPT model version to 2024-11-20 in Bicep templates (infra/main.bicep, infra/main_custom.bicep), ARM template (infra/main.json), and documentation (docs/CustomizingAzdParameters.md). [1] [2] [3] [4]
  • Changed role assignments in Bicep templates to use explicit Azure role definition IDs for "Cognitive Services OpenAI User" and "Storage Blob Data Contributor" instead of role names. [1] [2] [3] [4]

Workflow and Deployment Improvements:

  • Refactored GitHub Actions workflows to use ${{ 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]
  • Removed unnecessary workflow inputs and conditions from job-docker-build.yml, streamlining manual trigger and permissions. [1] [2]

Dependency and Documentation Updates:

  • Upgraded the axios dependency in the frontend to version 1.17.0.
  • Fixed a broken documentation link and updated the default GPT model version in CustomizingAzdParameters.md.

Template and Metadata Updates:

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

  • ...

Other Information

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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-20 across 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.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 10 out of 11 changed files in this pull request and generated 1 comment.

Files not reviewed (1)
  • src/frontend/package-lock.json: Generated file

Comment on lines +8 to +9
workflow_dispatch:

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated no new comments.

Files not reviewed (1)
  • src/frontend/package-lock.json: Generated file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants