Skip to content

Commit c7aa36f

Browse files
Refactor VM credential handling to use conditional expressions for default values
1 parent 84c395f commit c7aa36f

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

docs/DeploymentGuide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Copy the contents from the production configuration file to your main parameters
202202

203203
> **Note:** This section only applies if you selected **Production** deployment type in section 3.1. VMs are not deployed in the default Development/Testing configuration.
204204

205-
By default, random GUIDs are generated for VM credentials. To set custom credentials:
205+
By default, hard-coded fallback values are used for VM credentials (`JumpboxAdminUser` / `JumpboxAdminP@ssw0rd1234!`). To set custom credentials:
206206

207207
```shell
208208
azd env set AZURE_ENV_JUMPBOX_ADMIN_USERNAME <your-username>

infra/main.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (e
637637
enableTelemetry: enableTelemetry
638638
computerName: take(virtualMachineResourceName, 15)
639639
osType: 'Windows'
640-
vmSize: vmSize ?? 'Standard_D2s_v5'
641-
adminUsername: vmAdminUsername ?? 'JumpboxAdminUser'
642-
adminPassword: vmAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
640+
vmSize: !empty(vmSize) ? vmSize : 'Standard_D2s_v5'
641+
adminUsername: !empty(vmAdminUsername) ? vmAdminUsername : 'JumpboxAdminUser'
642+
adminPassword: !empty(vmAdminPassword) ? vmAdminPassword : 'JumpboxAdminP@ssw0rd1234!'
643643
managedIdentities: {
644644
systemAssigned: true
645645
}

infra/main.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16625,13 +16625,13 @@
1662516625
"value": "Windows"
1662616626
},
1662716627
"vmSize": {
16628-
"value": "[coalesce(parameters('vmSize'), 'Standard_D2s_v5')]"
16628+
"value": "[if(not(empty(parameters('vmSize'))), parameters('vmSize'), 'Standard_D2s_v5')]"
1662916629
},
1663016630
"adminUsername": {
16631-
"value": "[coalesce(parameters('vmAdminUsername'), 'JumpboxAdminUser')]"
16631+
"value": "[if(not(empty(parameters('vmAdminUsername'))), parameters('vmAdminUsername'), 'JumpboxAdminUser')]"
1663216632
},
1663316633
"adminPassword": {
16634-
"value": "[coalesce(parameters('vmAdminPassword'), 'JumpboxAdminP@ssw0rd1234!')]"
16634+
"value": "[if(not(empty(parameters('vmAdminPassword'))), parameters('vmAdminPassword'), 'JumpboxAdminP@ssw0rd1234!')]"
1663516635
},
1663616636
"managedIdentities": {
1663716637
"value": {

infra/main_custom.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,9 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (e
566566
enableTelemetry: enableTelemetry
567567
computerName: take(virtualMachineResourceName, 15)
568568
osType: 'Windows'
569-
vmSize: vmSize ?? 'Standard_D2s_v5'
570-
adminUsername: vmAdminUsername ?? 'JumpboxAdminUser'
571-
adminPassword: vmAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
569+
vmSize: !empty(vmSize) ? vmSize : 'Standard_D2s_v5'
570+
adminUsername: !empty(vmAdminUsername) ? vmAdminUsername : 'JumpboxAdminUser'
571+
adminPassword: !empty(vmAdminPassword) ? vmAdminPassword : 'JumpboxAdminP@ssw0rd1234!'
572572
managedIdentities: {
573573
systemAssigned: true
574574
}

0 commit comments

Comments
 (0)