main.bicep now has params: vmAdminUsername and vmAdminPassword

Author: DocGailZhou

infra/main.bicep

@@ -57,6 +57,14 @@ param secondaryLocation string?
 @description('Optional. Enable private networking for the resources. Set to true to enable private networking. Defaults to false.')
 param enablePrivateNetworking bool = false
 
+@description('Optional. Admin username for the Jumpbox Virtual Machine. Set to custom value if enablePrivateNetworking is true.')
+@secure()
+param vmAdminUsername string 
+
+@description('Optional. Admin password for the Jumpbox Virtual Machine. Set to custom value if enablePrivateNetworking is true.')
+@secure()
+param vmAdminPassword string 
+
 @description('Optional. Specifies the resource tags for all the resources. Tag "azd-env-name" is automatically added to all resources.')
 param tags object = {}
 
@@ -133,6 +141,8 @@ module network 'modules/network.bicep' = if (enablePrivateNetworking) {
   params: {
     resourcesName: resourcesName
     logAnalyticsWorkSpaceResourceId: logAnalyticsWorkspace.outputs.resourceId
+    vmAdminUsername: vmAdminUsername
+    vmAdminPassword: vmAdminPassword
     location: location
     tags: allTags
     enableTelemetry: enableTelemetry

infra/main.bicepparam

@@ -12,3 +12,5 @@ param enableScaling = true
 param enableRedundancy = true
 //param secondaryLocation = 'uksouth' // TODO - test this
 param enablePrivateNetworking = true
+param vmAdminUsername = 'JumpboxAdminUser'
+param vmAdminPassword = 'JumpboxAdminP@ssw0rd1234!'

infra/modules/network.bicep

@@ -14,6 +14,18 @@ param tags object = {}
 @description('Optional. Enable/Disable usage telemetry for module.')
 param enableTelemetry bool = true
 
+@description('Admin username for the VM.')
+@secure()
+param vmAdminUsername string 
+
+@description('Admin password for the VM.')
+@secure()
+param vmAdminPassword string 
+
+
+
+
+
 // Subnet Classless Inter-Doman Routing (CIDR)  Sizing Reference Table (Best Practices)
 // | CIDR      | # of Addresses | # of /24s | Notes                                 |
 // |-----------|---------------|-----------|----------------------------------------|
@@ -91,8 +103,8 @@ module network 'network/main.bicep' =  {
     jumpboxConfiguration: {
       name: 'vm-jumpbox-${resourcesName}'
       size: 'Standard_D2s_v3'
-      username: 'JumpboxAdminUser'
-      password: 'JumpboxAdminP@ssw0rd1234!'
+      username: vmAdminUsername
+      password: vmAdminPassword
       subnet:  {
         name: 'jumpbox'
         addressPrefixes: ['10.0.12.0/23'] // /23 (10.0.12.0 - 10.0.13.255), 512 addresses

infra/samples/network-subnet-design.bicep

@@ -30,6 +30,15 @@ param enableTelemetry bool = true
 @description('Optional. Tags to be applied to the resources.')
 param tags object = {}
 
+@description('Admin username for the VM.')
+@secure()
+param vmAdminUsername string = 'JumpboxAdminUser'
+
+@description('Admin password for the VM.')
+@secure()
+param vmAdminPassword string = 'JumpboxAdminP@ssw0rd1234!'
+
+
 import { bastionHostConfigurationType } from '../modules/network/bastionHost.bicep'
 @description('Optional. Configuration for the Azure Bastion Host. Leave null to omit Bastion creation.')
 param bastionConfiguration bastionHostConfigurationType = {
@@ -42,8 +51,8 @@ import { jumpBoxConfigurationType } from '../modules/network/jumpbox.bicep'
 param jumpboxConfiguration jumpBoxConfigurationType = {
   name: 'vm-jumpbox-${resourcesName}'
   size: 'Standard_D2s_v3' // Default size, can be overridden
-  username: 'JumpboxAdminUser'
-  password: 'JumpboxAdminP@ssw0rd1234!'
+  username: vmAdminUsername
+  password: vmAdminPassword 
   subnet: {
     name: 'jumpbox-subnet'
     addressPrefixes: ['10.0.12.0/23'] // /23 (10.0.12.0 - 10.0.13.255), 512 addresses