Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Microsoft.Compute.CredentialsCombo from portal user interface #616

Merged
merged 7 commits into from
Jan 19, 2022
Merged

Remove Microsoft.Compute.CredentialsCombo from portal user interface #616

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
465642e
update input control
brooke-hamilton Jan 19, 2022
65318bb
update input control
brooke-hamilton Jan 19, 2022
f159c43
update input control
brooke-hamilton Jan 19, 2022
dd7e8cb
update input control
brooke-hamilton Jan 19, 2022
840cd54
update input control
brooke-hamilton Jan 19, 2022
7165ba9
update input control
brooke-hamilton Jan 19, 2022
b68bc31
Update src/bicep/form/mlz.portal.json
brooke-hamilton Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions src/bicep/form/mlz.portal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,18 +861,17 @@
"password": "Password",
"confirmPassword": "Confirm password"
},
"type": "Microsoft.Compute.CredentialsCombo",
"type": "Microsoft.Common.PasswordBox",
"defaultValue": "",
"toolTip": {
"password": "Specify an administrator password for the Windows virtual machine used to remote into the network."
},
"toolTip": "Specify an administrator password for the Windows virtual machine used to remote into the network.",
"constraints": {
"required": true
"required": true,
"regex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{12,72}$",
"validationMessage": "The password must be alphanumeric, contain at least 12 characters, and have at least 1 letter, 1 number and one special character."
},
"options": {
"hideConfirmation": false
},
"osPlatform": "Windows"
}
}
]
},
Expand All @@ -886,7 +885,7 @@
"name": "linuxVmDescriptionTextblock",
"type": "Microsoft.Common.TextBlock",
"options": {
"text": "Provide an administrator username and password (or SSH public key) for the Linux virtual machine."
"text": "Provide an administrator username and password for the Linux virtual machine."
}
},
{
Expand All @@ -905,26 +904,20 @@
},
{
"name": "linuxVmAdminPasswordOrKey",
"type": "Microsoft.Compute.CredentialsCombo",
"type": "Microsoft.Common.PasswordBox",
"label": {
"authenticationType": "Authentication type",
"password": "Password",
"confirmPassword": "Confirm password",
"sshPublicKey": "SSH public key"
},
"toolTip": {
"authenticationType": "Select an authentication type",
"password": "Specify an administrator password for the Linux virtual machine used to remote into the network.",
"sshPublicKey": "Paste in an SSH Public Key for the Linux virtual machine used to remote into the network."
"confirmPassword": "Confirm password"
},
"toolTip": "Specify an administrator password for the Linux virtual machine used to remote into the network.",
"constraints": {
"required": true
"required": true,
"regex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{12,72}$",
"validationMessage": "The password must be alphanumeric, contain at least 12 characters, and have at least 1 letter, 1 number and one special character."
},
"options": {
"hideConfirmation": false,
"hidePassword": false
},
"osPlatform": "Linux"
"hideConfirmation": false
}
}
]
}
Expand Down Expand Up @@ -986,7 +979,7 @@
"windowsVmAdminUsername": "[steps('remoteAccess').windowsVmSection.windowsVmAdminUsername]",
"windowsVmAdminPassword": "[steps('remoteAccess').windowsVmSection.windowsVmAdminPassword.password]",
"linuxVmAdminUsername": "[steps('remoteAccess').linuxVmSection.linuxVmAdminUsername]",
"linuxVmAuthenticationType": "[steps('remoteAccess').linuxVmSection.linuxVmAdminPasswordOrKey.authenticationType]",
"linuxVmAuthenticationType": "password",
"linuxVmAdminPasswordOrKey": "[if(equals(steps('remoteAccess').linuxVmSection.linuxVmAdminPasswordOrKey.authenticationType, 'password'), steps('remoteAccess').linuxVmSection.linuxVmAdminPasswordOrKey.password, steps('remoteAccess').linuxVmSection.linuxVmAdminPasswordOrKey.sshPublicKey)]"
}
}
Expand Down