fix: down merge from main, fix DCR location#891
Merged
Roopan-Microsoft merged 16 commits intoJul 16, 2026
Conversation
fix: dev to main - Fix Dependabot alert issue
feat: Implement ACR deployment and update infrastructure scripts
fix: Refactor scripts for WAF changes and improve clarity
Harsh-Microsoft
requested review from
Avijit-Microsoft,
Roopan-Microsoft,
aniaroramsft,
malrose07,
nchandhi and
toherman-msft
as code owners
July 14, 2026 12:34
Contributor
There was a problem hiding this comment.
Pull request overview
This PR restructures the Azure deployment workflow to separate resource provisioning (azd up) from post-provision application image build/deploy and post-deploy data/index setup, while updating infrastructure to provision an ACR up-front (with placeholder runtime images) and improving monitoring/jumpbox behavior—especially when reusing an existing Log Analytics workspace.
Changes:
- Adds explicit post-provision scripts for (1) building/pushing images and updating App Service/ACI and (2) running
post_deploy.py-driven post-deploy tasks. - Updates IaC to provision ACR + private DNS zone support, configure placeholder images initially, and fix Log Analytics workspace/DCR location handling for existing workspaces.
- Revises deployment documentation and postprovision messaging; updates CODEOWNERS.
Reviewed changes
Copilot reviewed 14 out of 15 changed files in this pull request and generated 11 comments.
Show a summary per file
| File | Description |
|---|---|
| infra/scripts/process_sample_data.sh | New bash script to install post-deploy deps and run scripts/post_deploy.py. |
| infra/scripts/process_sample_data.ps1 | New PowerShell equivalent for running scripts/post_deploy.py. |
| infra/scripts/build_and_deploy_images.sh | New bash post-provision script to ACR-build images and update App Service/ACI. |
| infra/scripts/build_and_deploy_images.ps1 | New PowerShell equivalent for building/deploying images and updating services. |
| infra/modules/container-registry.bicep | New module to provision ACR, private endpoint/DNS (optional), and AcrPull assignments. |
| infra/modules/container-instance.bicep | Adds MI-based ACR auth wiring for future private image pulls. |
| infra/main.waf.parameters.json | Removes ACR/image tag parameters from WAF parameters file. |
| infra/main.parameters.json | Removes ACR/image tag parameters from default parameters file. |
| infra/main.json | Regenerated ARM template reflecting ACR provisioning, placeholder images, and monitoring/jumpbox updates. |
| infra/main.bicep | Provisions ACR, switches to placeholder images initially, improves existing Log Analytics handling, adjusts jumpbox/DCR. |
| infra/main_custom.bicep | Aligns DCR location with Log Analytics workspace location in custom deployment. |
| docs/DEPLOYMENT.md | Notes the new “provision then run scripts” deployment flow. |
| docs/AZD_DEPLOYMENT.md | Updates azd up guidance to reflect the new post-provision scripts. |
| azure.yaml | Postprovision hooks updated to print instructions instead of running post-deploy logic automatically. |
| .github/CODEOWNERS | Updates default owners list. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Roopan-Microsoft
approved these changes
Jul 15, 2026
Roopan-Microsoft
approved these changes
Jul 16, 2026
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 makes significant improvements to the Azure deployment process and supporting documentation. The main focus is to separate resource provisioning from application image build and deployment, clarify post-provision steps, and enhance infrastructure reliability and clarity. The changes also update documentation and resource ownership information.
Key changes include:
Deployment Process and Documentation
azd uponly provisions Azure resources; building and deploying application images, as well as loading sample data, are now handled by two explicit follow-up scripts. The documentation (docs/AZD_DEPLOYMENT.md,docs/DEPLOYMENT.md) has been extensively revised to reflect this new process, providing step-by-step instructions and clarifying the purpose and order of each script. [1] [2] [3]azure.yamlfor both Windows and POSIX systems have been streamlined to print clear instructions for the two follow-up scripts instead of running post-deploy logic automatically. This removes complexity from the provisioning step and aligns with the new documented workflow.Infrastructure as Code (Bicep) Improvements
infra/main.bicep) now provisions the Azure Container Registry (ACR) with a placeholder image, and the App Service and Container Instance are initially configured to use a public "hello-world" image. The actual application images are pushed and deployed in a post-provision step, improving reliability and separation of concerns. [1] [2] [3] [4] [5] [6] [7]Security and Networking
Ownership and Miscellaneous
.github/CODEOWNERSfile to reflect current team member usernames.These changes collectively make the deployment process more robust, user-friendly, and maintainable, while also improving security and clarity for both developers and operators.
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information