Skip to content

chore: Update acr script to handle WAF deployment#649

Merged
Roopan-Microsoft merged 4 commits into
microsoft:mainfrom
chaudhariniraj:psl-add-acr
Jul 8, 2026
Merged

chore: Update acr script to handle WAF deployment#649
Roopan-Microsoft merged 4 commits into
microsoft:mainfrom
chaudhariniraj:psl-add-acr

Conversation

@chaudhariniraj

Copy link
Copy Markdown
Contributor

Purpose

Update acr script to handle WAF deployment

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 PR updates the ACR build/push automation scripts to detect WAF deployments (via the resource group tags.Type) and temporarily relax ACR network/export restrictions during image build/push, then restore the previous (expected) locked-down configuration afterward.

Changes:

  • Detect WAF deployments by querying the resource group tag Type.
  • Temporarily relax ACR settings (allow-exports, public-network-enabled, default-action) for WAF deployments.
  • Add cleanup/rollback logic (trap in Bash; try/finally in PowerShell) to restore ACR restrictions at script exit.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File Description
infra/scripts/acr_build_push.sh Adds WAF detection and ACR relax/restore logic via az acr update and an EXIT trap.
infra/scripts/acr_build_push.ps1 Adds WAF detection and ACR relax/restore logic via az acr update and try/finally.

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

Comment thread infra/scripts/acr_build_push.sh
Comment thread infra/scripts/acr_build_push.sh
Comment thread infra/scripts/acr_build_push.ps1
Comment thread infra/scripts/acr_build_push.ps1 Outdated
Copilot AI review requested due to automatic review settings July 8, 2026 06:08

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 3 out of 3 changed files in this pull request and generated 3 comments.

Comment thread infra/scripts/acr_build_push.ps1
Comment thread infra/scripts/acr_build_push.ps1
Comment thread infra/modules/container-registry.bicep Outdated
Copilot AI review requested due to automatic review settings July 8, 2026 06:20

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 3 out of 3 changed files in this pull request and generated no new comments.

@Roopan-Microsoft Roopan-Microsoft merged commit 591debf into microsoft:main Jul 8, 2026
3 checks passed
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.

3 participants