chore: resolved conflicts

[Prajwal-Microsoft]

Purpose

This pull request makes several updates to the CosmosDB configuration and the deployment template for the Content Processing Solution Accelerator. The main changes involve removing the enableAnalyticalStorage setting from CosmosDB, updating the template hash, and adjusting the order of dependencies for private DNS zones.

CosmosDB Configuration:

• Removed the enableAnalyticalStorage property from the CosmosDB resource configuration in both infra/main.bicep and the generated infra/main.json template. This means analytical storage will no longer be enabled by default for the database account. [1] [2]

Deployment Template Updates:

• Updated the templateHash in infra/main.json to reflect changes in the Bicep-generated template.

Resource Dependency Management:

• Reordered the dependsOn array for resources to ensure the contentUnderstanding private DNS zone dependency appears before cognitiveServices, aligning with best practices for resource provisioning order.

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]

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates the CosmosDB deployment configuration and regenerated ARM template for the Content Processing Solution Accelerator, including removing Analytical Storage enablement and adjusting resource dependency listing.

Changes:

• Removed enableAnalyticalStorage from the Cosmos DB module configuration and generated template.
• Updated generated templateHash metadata in infra/main.json.
• Reordered one dependsOn list related to private DNS zones.

Reviewed changes

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

File	Description
infra/main.json	Regenerated template metadata; removed analytical storage parameter; reordered a dependsOn entry for private DNS zones.
infra/main.bicep	Removed enableAnalyticalStorage from the Cosmos DB module invocation.

Comments suppressed due to low confidence (1)

infra/main.json:1

• Reordering entries within a single ARM dependsOn array does not enforce provisioning order; ARM treats the list as an unordered set of dependencies. If the intent is to ensure one specific resource is created before another (e.g., cognitiveServices after contentUnderstanding), model that by adding an explicit dependency edge between the relevant resources (or have the later resource/module explicitly dependsOn the earlier one), rather than relying on array order.

---

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

[github-actions]

🎉 This PR is included in version 2.0.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀