Skip to content

fix: merging dev to main#456

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

fix: merging dev to main#456
Priyanka1-Microsoft wants to merge 10 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

@microsoft-github-policy-service

Copy link
Copy Markdown

@Priyanka1-Microsoft please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

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.

fix: merging main to dev
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.

6 participants