Skip to content

fix: merging dev to main #2126

Merged
Roopan-Microsoft merged 204 commits intomainfrom
dev
Apr 6, 2026
Merged

fix: merging dev to main #2126
Roopan-Microsoft merged 204 commits intomainfrom
dev

Conversation

@Roopan-Microsoft
Copy link
Copy Markdown
Contributor

Purpose

  • This pull request updates the default VM size for the jumpbox and improves documentation and deployment logic to reflect this change. It also introduces a conditional deployment for Azure AI Search based on the selected database type and updates the generated ARM template to use the latest Bicep version. Below are the most important changes:

Jumpbox VM Size Default Update

  • Changed the default jumpbox VM size from Standard_DS2_v2 to Standard_D2s_v5 in infra/main.bicep, the generated infra/main.json, and all related module parameter usages and documentation references. This ensures that deployments use a more current and widely available VM size by default. [1] [2] [3] [4] [5] [6]

  • Updated troubleshooting documentation for the SkuNotAvailable error to reference the new default VM size, provide guidance on checking availability, and recommend alternatives if the default is unavailable in a region.

Conditional Resource Deployment

  • Modified the deployment logic so that the Azure AI Search resource is only created if the selected databaseType is CosmosDB, both in infra/main.bicep and the generated infra/main.json. This avoids unnecessary resource creation. [1] [2]

Template and Tooling Updates

  • Regenerated infra/main.json with Bicep version 0.41.2.15936 (was 0.40.2.10011), updating all associated template hashes and metadata throughout the file. This brings the infrastructure code up to date with the latest tooling. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17]

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

Roopan-Microsoft and others added 30 commits November 25, 2024 16:02
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Ross Smith <[email protected]>
Co-authored-by: gpickett <[email protected]>
Co-authored-by: Francia Riesco <[email protected]>
Co-authored-by: Francia Riesco <[email protected]>
Co-authored-by: Prajwal D C <[email protected]>
…nd Update Conversation flow based on template selection (#1567)

Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavan-Microsoft <[email protected]>
@Roopan-Microsoft Roopan-Microsoft added this pull request to the merge queue Apr 6, 2026
Merged via the queue into main with commit 1764c3b Apr 6, 2026
20 of 21 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.