chore: Dev to Main by AjitPadhi1-Microsoft · Pull Request #637 · microsoft/content-processing-solution-accelerator

AjitPadhi1-Microsoft · 2026-06-26T09:14:25Z

Purpose

This pull request introduces several improvements and updates to the deployment workflows, infrastructure templates, and dependencies for the project. The most significant changes are focused on standardizing the use of GitHub Actions variables, expanding Azure region support, improving deployment dependencies, and updating a Python dependency.

Workflow and Deployment Improvements:

Standardized the use of vars.ACR_TEST_LOGIN_SERVER instead of secrets.ACR_TEST_LOGIN_SERVER across all workflow files for referencing the Azure Container Registry, including in login steps and Docker image tagging. This makes the workflows more consistent and secure. [1] [2] [3] [4] [5] [6] [7] [8]
Updated the trigger and input handling in the job-docker-build.yml workflow, removing unnecessary inputs and simplifying the workflow to trigger directly on workflow_dispatch. [1] [2]

Infrastructure and Region Support:

Added support for the swedencentral Azure region in both Bicep (infra/main.bicep, infra/main_custom.bicep) and generated ARM templates (infra/main.json), including its replica region mapping. [1] [2] [3] [4] [5] [6]
Improved module dependencies for private endpoints in Bicep templates to ensure correct deployment order by explicitly depending on avmAiServices, virtualNetwork, and avmPrivateDnsZones. [1] [2] [3]

Dependency Updates:

Updated the Python dependency pyjwt from version 2.12.1 to 2.13.0 in pyproject.toml.

Template and Generator Updates:

Upgraded the Bicep compiler version used to generate infra/main.json and updated template hashes accordingly, reflecting the changes in the infrastructure codebase. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]

If you have any questions about these changes or need clarification on how they affect your workflow, let me know!

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

ci: Refactor Docker workflow

…proved quota check fallback logic

…replication

Upgrades security-critical packages across ContentProcessor, ContentProcessorWorkflow, and ContentProcessorWeb modules. ContentProcessorWorkflow (Python): - aiohttp: 3.13.5 → 3.14.1 (MEDIUM severity, transitive → direct) - python-multipart: 0.0.27 → 0.0.31 (HIGH severity) - cryptography: 46.0.7 → 48.0.1 (HIGH severity) - pyjwt: 2.12.1 → 2.13.0 (MEDIUM/HIGH severity) - starlette: 1.0.1 → 1.3.1 (HIGH severity, transitive → direct) ContentProcessor (Python): - pyjwt: 2.12.1 → 2.13.0 (MEDIUM/HIGH severity) - Other vulnerable packages upgraded via transitive dependencies: • aiohttp 3.14.1 (via azure-functions-durable) • cryptography 48.0.1 (via azure-identity, msal, pyjwt) • python-multipart 0.0.31 (via fastapi) • starlette 1.3.1 (via fastapi, sse-starlette) ContentProcessorWeb (NPM): Direct dependencies: - axios: 1.15.2 → 1.16.0 (HIGH severity) - react-router-dom: 7.13.2 → 7.15.1 (HIGH/LOW severity) - qs: 6.14.2 → 6.15.2 (MEDIUM severity) - uuid: 11.1.0 → 11.1.1 (MEDIUM severity) - webpack-dev-server: 5.2.1 → 5.2.4 (MEDIUM severity) Transitive dependencies (via lock file): - shell-quote → 1.8.4 (CRITICAL severity) - form-data → 4.0.6 (HIGH severity) - ws → 8.21.0 (HIGH severity) - js-yaml → 4.2.0 (MEDIUM severity) - launch-editor → 2.14.1 (MEDIUM severity) - @babel/core → 7.29.6 (LOW severity) Testing: - All uv sync operations: PASSED - ContentProcessorWeb build: PASSED - No breaking changes - Verified all secure versions present in lock files Resolves ~114 security alerts (71% reduction from 161 → ~47). Note: ContentProcessorAPI excluded per team guidance. Closes #624 Closes #611 Closes #614

fix: Deployment Failure and pipeline failure for CPAsh

…17-cp fix: dependabot package upgrades (June 2026)

…nd uv.lock

… 1.9.0 - Change @babel/core override from >=7.29.6 to ^7.29.6 to prevent Babel 8 which is incompatible with babel-preset-react-app - Upgrade agent-framework from 1.3.0 to 1.9.0 to satisfy agent-framework-orchestrations requiring agent-framework-core>=1.9.0 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…rocessing-solution-accelerator into psl-congen24

….toml

…oml and uv.lock

…r dependencies

github-actions · 2026-06-26T09:15:16Z

Coverage Report •

File	Stmts	Miss	Cover	Missing
TOTAL	1217	161	86%

report-only-changed-files is enabled. No files were changed during this commit :)

Tests	Skipped	Failures	Errors	Time
244	0 💤	0 ❌	0 🔥	4.355s ⏱️

Copilot

Pull request overview

This PR syncs changes from the development branch into main, primarily updating dependency lockfiles (Python + Node), refreshing generated ARM output from Bicep, and adjusting CI/CD workflows for container builds and deployments.

Changes:

Bump multiple Python dependencies (e.g., aiohttp, cryptography, pyjwt, python-multipart, starlette) and update uv.lock/pyproject.toml accordingly.
Update front-end dependencies and pnpm overrides/lockfile (e.g., react-router-dom, axios, qs, webpack-dev-server, uuid).
Update infra templates to include swedencentral, refresh generated infra/main.json, and modify GitHub Actions workflows around ACR usage and docker build orchestration.

Reviewed changes

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

Show a summary per file

File	Description
src/ContentProcessorWorkflow/uv.lock	Updates pinned Python package versions/metadata for the workflow service.
src/ContentProcessorWorkflow/pyproject.toml	Aligns direct workflow dependencies with the updated lockfile.
src/ContentProcessorWeb/pnpm-lock.yaml	Updates resolved JS dependency graph and override resolutions.
src/ContentProcessorWeb/package.json	Pins select dependencies/overrides to newer versions.
src/ContentProcessor/uv.lock	Updates pinned Python package versions/metadata for the processor service.
src/ContentProcessor/pyproject.toml	Updates direct dependency pin for `pyjwt`.
infra/main.json	Regenerated ARM template output; includes region additions and dependency graph changes.
infra/main.bicep	Adds `swedencentral` support and adjusts module `dependsOn` for private endpoint.
infra/main_custom.bicep	Mirrors `main.bicep` region + dependency changes for custom deployment path.
.github/workflows/job-docker-build.yml	Refactors reusable docker build workflow; switches ACR endpoint sourcing to `vars.*` and adds manual trigger.
.github/workflows/job-deploy-windows.yml	Switches ACR endpoint sourcing to `vars.ACR_TEST_LOGIN_SERVER`.
.github/workflows/job-deploy-linux.yml	Switches ACR endpoint sourcing to `vars.ACR_TEST_LOGIN_SERVER`.
.github/workflows/deploy-orchestrator.yml	Updates how the orchestrator calls the docker build reusable workflow and applies job-level gating.

Files not reviewed (1)

src/ContentProcessorWeb/pnpm-lock.yaml: Generated file

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

chore: Down merge from main to dev

Copilot

Pull request overview

Copilot reviewed 13 out of 17 changed files in this pull request and generated 3 comments.

… uv.lock

…and uv.lock

fix: downgrade agent-framework to version 1.3.0 in pyproject.toml and uv.lock

Vamshi-Microsoft and others added 19 commits June 16, 2026 11:01

refactor: Replace secrets with vars for ACR name in Docker workflows

8bd4e47

Merge pull request #622 from microsoft/psl-refactor-docker-workflow

1963df3

ci: Refactor Docker workflow

Add swedencentral region, explicit dependsOn for private endpoint, im…

1ceafb4

…proved quota check fallback logic

Fix quota check to use effective deployment capacity and region fallback

0137481

Add swedencentral replica region pairing for Log Analytics workspace …

5c12ef5

…replication

Revert non-Bicep changes from recent infra commits

4fd854e

Regenerate main.json from main.bicep

03c64a9

Regenerate main.json using Bicep v0.44.1

6fdac2e

Merge pull request #628 from microsoft/Ash17-Bicep17-Changes17

7f770ae

fix: Deployment Failure and pipeline failure for CPAsh

Merge pull request #629 from microsoft/feature/dependabot-june2026-06…

e978828

…17-cp fix: dependabot package upgrades (June 2026)

chore: update pydantic-settings to version 2.14.2 in pyproject.toml a…

0b81084

…nd uv.lock

Potential fix for pull request finding

cb9a6d5

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Refactor code structure for improved readability and maintainability

e81586f

Merge branch 'psl-congen24' of https://github.com/microsoft/content-p…

6cf123c

…rocessing-solution-accelerator into psl-congen24

Downgrade agent-framework dependency from 1.9.0 to 1.3.0 in pyproject…

5be9a47

….toml

Upgrade agent-framework dependency from 1.3.0 to 1.9.0 in pyproject.t…

4d882fd

…oml and uv.lock

Update package.json and pnpm-lock.yaml to use caret (^) versioning fo…

a6e7ef7

…r dependencies

Copilot AI review requested due to automatic review settings June 26, 2026 09:14

AjitPadhi1-Microsoft requested review from Avijit-Microsoft, Roopan-Microsoft, Anish Arora (aniaroramsft), dgp10801, nchandhi and Todd Herman (toherman-msft) as code owners June 26, 2026 09:14

AjitPadhi1-Microsoft temporarily deployed to production June 26, 2026 09:14 — with GitHub Actions Inactive

Copilot started reviewing on behalf of AjitPadhi1-Microsoft June 26, 2026 09:14

View session

Copilot AI reviewed Jun 26, 2026

View reviewed changes

Comment thread .github/workflows/job-docker-build.yml Resolved

fix: update pydantic-settings to version 2.14.2 in pyproject.toml

48c93af

Avijit-Microsoft temporarily deployed to production June 26, 2026 10:44 — with GitHub Actions Inactive

Merge pull request #639 from microsoft/main

3ca0180

chore: Down merge from main to dev

Copilot AI review requested due to automatic review settings June 27, 2026 03:19

Avijit-Microsoft temporarily deployed to production June 27, 2026 03:19 — with GitHub Actions Inactive

Copilot started reviewing on behalf of Avijit-Microsoft June 27, 2026 03:19

View session

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Comment thread .github/workflows/job-docker-build.yml Resolved

Comment thread .github/workflows/job-deploy-windows.yml Resolved

Comment thread .github/workflows/job-deploy-linux.yml Resolved

Dhanushree-Microsoft and others added 3 commits June 29, 2026 14:00

fix: downgrade agent-framework to version 1.3.0 in pyproject.toml and…

cd89282

… uv.lock

fix: add agent-framework-orchestrations dependency in pyproject.toml …

49d1a89

…and uv.lock

Merge pull request #641 from microsoft/psl-cpdhmoh29

3547feb

fix: downgrade agent-framework to version 1.3.0 in pyproject.toml and uv.lock

Avijit-Microsoft temporarily deployed to production June 29, 2026 11:05 — with GitHub Actions Inactive

Prajwal1-Microsoft approved these changes Jun 29, 2026

View reviewed changes

Avijit-Microsoft approved these changes Jun 29, 2026

View reviewed changes

Avijit-Microsoft merged commit d99e090 into main Jun 29, 2026
14 checks passed

Navigation Menu

Repository navigation

chore: Dev to Main - #637

chore: Dev to Main#637
Avijit-Microsoft merged 24 commits into
mainfrom
dev

AjitPadhi1-Microsoft commented Jun 26, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 26, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

AjitPadhi1-Microsoft commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose

Does this introduce a breaking change?

Golden Path Validation

Deployment Validation

What to Check

Other Information

Uh oh!

github-actions Bot commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

AjitPadhi1-Microsoft commented Jun 26, 2026 •

edited

Loading

github-actions Bot commented Jun 26, 2026 •

edited

Loading