Skip to content

fix: down merge from main, fix DCR location#891

Merged
Roopan-Microsoft merged 16 commits into
microsoft:devfrom
Harsh-Microsoft:psl-hb-bug-48699
Jul 16, 2026
Merged

fix: down merge from main, fix DCR location#891
Roopan-Microsoft merged 16 commits into
microsoft:devfrom
Harsh-Microsoft:psl-hb-bug-48699

Conversation

@Harsh-Microsoft

Copy link
Copy Markdown
Contributor

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

  • Updated the deployment flow so azd up only 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]
  • The postprovision hooks in azure.yaml for 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

  • The Bicep template (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]
  • Enhanced support for using an existing Log Analytics workspace by parsing its resource ID and location, and ensuring dependent resources (such as Data Collection Rules) are deployed in the correct region. [1] [2]

Security and Networking

  • Improved the virtual machine (jumpbox) configuration to generate a secure password if one is not provided, assign necessary managed identities and roles for Entra ID login, and update data collection rules for more accurate event logging. [1] [2] [3] [4]
  • Added private DNS zone support for the Container Registry, ensuring private networking scenarios are fully supported.

Ownership and Miscellaneous

  • Updated the .github/CODEOWNERS file 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?

  • 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 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.

Comment thread infra/main.bicep
Comment thread infra/modules/container-instance.bicep
Comment thread infra/scripts/process_sample_data.sh
Comment thread infra/scripts/process_sample_data.sh
Comment thread infra/scripts/process_sample_data.ps1
Comment thread docs/AZD_DEPLOYMENT.md
Comment thread docs/AZD_DEPLOYMENT.md
Comment thread docs/DEPLOYMENT.md
Comment thread azure.yaml
Comment thread azure.yaml
@Harsh-Microsoft Harsh-Microsoft changed the title fix: down merge from main, fic DCR location fix: down merge from main, fix DCR location Jul 15, 2026
@Roopan-Microsoft
Roopan-Microsoft merged commit 4729264 into microsoft:dev Jul 16, 2026
5 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.

6 participants