Skip to content

Commit 0591b31

Browse files
Merge pull request #674 from microsoft/hb-psl-bug-27372
refactor: make virtual machine admin username and password optional with default values
2 parents b30ad04 + 17903e1 commit 0591b31

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

infra/main.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ param enablePrivateNetworking bool = false
123123

124124
@secure()
125125
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
126-
param virtualMachineAdminUsername string = take(newGuid(), 20)
126+
param virtualMachineAdminUsername string?
127127

128128
@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
129129
@secure()
130-
param virtualMachineAdminPassword string = newGuid()
130+
param virtualMachineAdminPassword string?
131131

132132
// These parameters are changed for testing - please reset as part of publication
133133

@@ -608,8 +608,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
608608
computerName: take(virtualMachineResourceName, 15)
609609
osType: 'Windows'
610610
vmSize: virtualMachineSize
611-
adminUsername: virtualMachineAdminUsername
612-
adminPassword: virtualMachineAdminPassword
611+
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
612+
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
613613
patchMode: 'AutomaticByPlatform'
614614
bypassPlatformSafetyChecksOnUserSchedule: true
615615
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId

infra/main_custom.bicep

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,11 @@ param enablePrivateNetworking bool = false
124124

125125
@secure()
126126
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
127-
param virtualMachineAdminUsername string = take(newGuid(), 20)
127+
param virtualMachineAdminUsername string?
128128

129129
@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
130130
@secure()
131-
param virtualMachineAdminPassword string = newGuid()
132-
131+
param virtualMachineAdminPassword string?
133132
// These parameters are changed for testing - please reset as part of publication
134133

135134
@description('Optional. The Container Registry hostname where the docker images for the backend are located.')
@@ -923,8 +922,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
923922
computerName: take(virtualMachineResourceName, 15)
924923
osType: 'Windows'
925924
vmSize: virtualMachineSize
926-
adminUsername: virtualMachineAdminUsername
927-
adminPassword: virtualMachineAdminPassword
925+
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
926+
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
928927
patchMode: 'AutomaticByPlatform'
929928
bypassPlatformSafetyChecksOnUserSchedule: true
930929
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId

0 commit comments

Comments
 (0)