Skip to content

fix: Merging the changes from dev to main#295

Merged
Roopan-Microsoft merged 3 commits intomainfrom
dev
Oct 21, 2025
Merged

fix: Merging the changes from dev to main#295
Roopan-Microsoft merged 3 commits intomainfrom
dev

Conversation

@Abdul-Microsoft
Copy link
Copy Markdown
Contributor

Purpose

  • This pull request updates the AI Foundry module integration and makes several improvements to the Bicep and generated ARM templates for the Content Processing Solution Accelerator. The most significant changes involve switching the AI Foundry module to a new Bicep file, updating how diagnostic settings are handled, and correcting resource dependencies.

AI Foundry Module Update:

  • Switched the AI Foundry module reference in infra/main.bicep from modules/account/main.bicep to modules/account/aifoundry.bicep to ensure the correct resources and parameters are used for AI services.

ARM Template Improvements:

  • Changed the way diagnosticSettings are set in the generated ARM template (infra/main.json), now conditionally assigning values based on whether a Log Analytics Workspace resource ID is provided, improving template flexibility and correctness.

Resource Dependency Fixes:

  • Corrected the ordering of dependencies for private DNS zones in the ARM template to ensure proper deployment sequencing, specifically moving the contentUnderstanding DNS zone to the correct position.

Template Metadata Updates:

  • Updated templateHash values in the ARM template metadata to reflect the changes in the template structure. [1] [2]

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

@Prajwal-Microsoft Prajwal-Microsoft self-requested a review October 21, 2025 14:53
@Roopan-Microsoft Roopan-Microsoft merged commit d1718ac into main Oct 21, 2025
6 checks passed
@github-actions
Copy link
Copy Markdown

🎉 This PR is included in version 1.10.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants