feat: Add VM size recommendations for Bastion and Jumpbox subnets by Yatish-Microsoft · Pull Request #777 · microsoft/content-generation-solution-accelerator

Yatish-Microsoft · 2026-03-17T11:56:57Z

…virtualNetwork.bicep

Purpose

Upgraded VM Size...

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

…virtualNetwork.bicep

Copilot

Pull request overview

This PR updates the infrastructure templates to support (and document) VM administration in private-networking deployments by adding Bastion/Jumpbox-related networking and configuration parameters.

Changes:

Renames VNet module parameters (vnetName/vnetLocation/vnetAddressPrefixes → name/location/addressPrefixes) and makes Bastion/Jumpbox subnets always included when the VNet module is deployed.
Adds Azure Bastion Host + a Windows Jumpbox VM deployment (when enablePrivateNetworking is enabled), including new parameters for VM size and admin credentials.
Updates WAF parameters and documentation to expose jumpbox configuration via azd environment variables/parameters.

Reviewed changes

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

File	Description
infra/modules/virtualNetwork.bicep	Renames params and makes Bastion/Jumpbox subnets unconditional within the module.
infra/main.bicep	Adds Bastion Host + Jumpbox VM modules and new input params for VM sizing/credentials.
infra/main.waf.parameters.json	Adds parameter wiring for jumpbox admin username/password and VM size.
docs/CustomizingAzdParameters.md	Documents new/expanded parameters for private networking + jumpbox configuration.

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

Copilot

Pull request overview

Copilot reviewed 4 out of 5 changed files in this pull request and generated 3 comments.

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

…n private networking

Copilot

Pull request overview

Copilot reviewed 5 out of 6 changed files in this pull request and generated 4 comments.

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

Yatish-Microsoft · 2026-03-26T13:01:44Z

@copilot open a new pull request to apply changes based on the comments in this thread

Copilot

Pull request overview

Copilot reviewed 4 out of 5 changed files in this pull request and generated 3 comments.

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

Copilot · 2026-04-02T15:17:28Z

 /****************************************************************************************************************************/
 @description('Name of the virtual network.')
-param vnetName string 
+param name string


param name introduces a symbol collision with the existing output name declared later in this module. Bicep does not allow a parameter and an output to share the same identifier, so this will fail compilation. Rename either the parameter (e.g., vnetName) or the output (e.g., virtualNetworkName) and update the call sites accordingly.

Suggested change

param name string

param vnetName string

Copilot · 2026-04-02T15:17:29Z

 @batchSize(1)
 module nsgs 'br/public:avm/res/network/network-security-group:0.5.2' = [
  for (subnet, i) in vnetSubnets: if (!empty(subnet.?networkSecurityGroup)) {
    name: take('avm.res.network.network-security-group.${subnet.?networkSecurityGroup.name}.${resourceSuffix}', 64)
    params: {
      name: '${subnet.?networkSecurityGroup.name}-${resourceSuffix}'
-      location: vnetLocation
+      location: location
      securityRules: subnet.?networkSecurityGroup.securityRules


The nsgs module is declared as an array comprehension with an if filter, but later the subnet loop indexes into nsgs[i] using the original vnetSubnets index. If any subnet ever omits networkSecurityGroup, the nsgs array indices will no longer align with vnetSubnets, causing wrong NSG attachments or index errors. Consider removing the if filter (since you already set networkSecurityGroupResourceId to null when absent) or build an explicit map from subnet name to NSG resourceId.

Copilot · 2026-04-02T15:17:29Z

+// Azure Bastion Host
+var bastionHostName = 'bas-${solutionSuffix}'
+var zoneSupportedJumpboxLocations = [
+  'australiaeast'
+  'centralus'
+  'eastus'
+  'eastus2'


The PR title/description suggests this change is limited to VM size recommendations, but this diff actually adds new deployable infrastructure (Azure Bastion Host + a Windows jumpbox VM) gated by parameters. Please update the PR description/title to reflect the real scope (new Bastion/jumpbox resources and associated parameters) so reviewers understand the cost/behavior impact.

Yatish-Microsoft · 2026-04-02T15:50:39Z

@copilot apply changes based on the comments in this thread

…e in virtualNetwork.bicep Agent-Logs-Url: https://github.com/microsoft/content-generation-solution-accelerator/sessions/738e0d94-7901-44a8-a7a0-da1bf0928444 Co-authored-by: Yatish-Microsoft <234036280+Yatish-Microsoft@users.noreply.github.com>

Copilot · 2026-04-02T16:26:27Z

@copilot apply changes based on the comments in this thread

Applied in commit dafa23d. Renamed param name to param vnetName in infra/modules/virtualNetwork.bicep to fix the symbol collision with output name — updated all internal references and the main.bicep call site accordingly. The if filter in the NSG loop was retained since Bicep conditional loops maintain index alignment, and removing it would risk runtime errors if any subnet without a networkSecurityGroup were ever added.

github-actions · 2026-04-13T05:40:24Z

🎉 This PR is included in version 2.4.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

docs: add VM size recommendations for Bastion and Jumpbox subnets in …

1252f6f

…virtualNetwork.bicep

Yatish-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft, Roopan-Microsoft, Vinay-Microsoft, aniaroramsft, malrose07, nchandhi and toherman-msft as code owners March 17, 2026 11:56

Yatish-Microsoft added 3 commits March 20, 2026 18:50

Add Bastion and Jumpbox VM using existing VNet configuration.

7b83c0c

Merge branch 'dev' into dev-yat

731c130

updated main.json

816f8c9

Yatish-Microsoft requested a review from Copilot March 23, 2026 06:54

Copilot started reviewing on behalf of Yatish-Microsoft March 23, 2026 06:55 View session

Copilot AI reviewed Mar 23, 2026

View reviewed changes

Comment thread infra/modules/virtualNetwork.bicep Outdated

Comment thread infra/modules/virtualNetwork.bicep Outdated

Comment thread infra/main.bicep

Comment thread infra/main.bicep Outdated

Comment thread infra/main.bicep

Yatish-Microsoft requested a review from Copilot March 26, 2026 12:21

Copilot started reviewing on behalf of Yatish-Microsoft March 26, 2026 12:22 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

Comment thread infra/modules/virtualNetwork.bicep Outdated

Comment thread infra/main.bicep

Comment thread infra/main.bicep

Merge remote-tracking branch 'origin/dev' into dev-yat

45f9efa

Yatish-Microsoft temporarily deployed to production March 26, 2026 12:41 — with GitHub Actions Inactive

feat: add support for deploying Azure Bastion and Jumpbox resources i…

8cf7f41

…n private networking

Yatish-Microsoft temporarily deployed to production March 26, 2026 12:49 — with GitHub Actions Inactive

Yatish-Microsoft requested a review from Copilot March 26, 2026 12:50

Copilot started reviewing on behalf of Yatish-Microsoft March 26, 2026 12:51 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

Comment thread infra/main.bicep Outdated

Comment thread infra/modules/virtualNetwork.bicep Outdated

Comment thread docs/CustomizingAzdParameters.md Outdated

Comment thread infra/main.bicep

Yatish-Microsoft closed this Mar 26, 2026

Yatish-Microsoft reopened this Mar 26, 2026

Yatish-Microsoft temporarily deployed to production March 26, 2026 13:11 — with GitHub Actions Inactive

Yatish-Microsoft requested a review from Copilot March 26, 2026 13:13

Copilot AI requested a review from Rafi-Microsoft March 27, 2026 07:38

Copilot AI temporarily deployed to production March 27, 2026 07:39 Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 07:43 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 07:46 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 07:47 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 07:55 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 07:59 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 12:02 — with GitHub Actions Inactive

Yatish-Microsoft had a problem deploying to production March 27, 2026 12:04 — with GitHub Actions Failure

Yatish-Microsoft temporarily deployed to production March 27, 2026 12:19 — with GitHub Actions Inactive

Yatish-Microsoft had a problem deploying to production March 27, 2026 12:33 — with GitHub Actions Failure

Yatish-Microsoft temporarily deployed to production March 27, 2026 12:35 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 12:41 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 12:47 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 13:04 — with GitHub Actions Inactive

Yatish-Microsoft temporarily deployed to production March 27, 2026 13:08 — with GitHub Actions Inactive

chore: remove event_utils changes from PR

7494e38

Yatish-Microsoft requested a review from Copilot April 2, 2026 15:11

Copilot started reviewing on behalf of Yatish-Microsoft April 2, 2026 15:12 View session

Copilot AI reviewed Apr 2, 2026

View reviewed changes

Copilot started work on behalf of Yatish-Microsoft April 2, 2026 16:22 View session

Copilot finished work on behalf of Yatish-Microsoft April 2, 2026 16:27

Prajwal-Microsoft approved these changes Apr 8, 2026

View reviewed changes

Avijit-Microsoft approved these changes Apr 8, 2026

View reviewed changes

Avijit-Microsoft merged commit 8a74f59 into dev Apr 8, 2026
3 checks passed

github-actions bot added the released label Apr 13, 2026

Conversation

Yatish-Microsoft commented Mar 17, 2026

Purpose

Does this introduce a breaking change?

Golden Path Validation

Deployment Validation

What to Check

Other Information

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Yatish-Microsoft commented Mar 26, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Yatish-Microsoft commented Apr 2, 2026

Uh oh!

Copilot AI commented Apr 2, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants