[vm] Enable password and ssh key authentication during linux VM creation #7863

adewaleo · 2018-11-16T02:34:33Z

Fixes #6230

--authentication-type now accepts all, which enables both password and ssh key authentication for linux vm's. Providing both password and ssh key value enables both forms of authentication without explicitly setting --authentication-type.
Updated authentication type validation error message.
Added tests.

This checklist is used to make sure that common guidelines for a pull request are followed.

The PR has modified HISTORY.rst describing any customer-facing, functional changes. Note that this does not include changes only to help content. (see Modifying change log).
I adhere to the Command Guidelines.

…thentication

…dev branch.

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_template_builder.py

Fix conflict by checking out ephemeral os disk recording from dev branch.

adewaleo · 2018-11-20T00:15:26Z

@yugangw-msft, please let me know if this looks good to you.

yugangw-msft

LGTM, please clean up a few minor things and merge.

yugangw-msft · 2018-11-20T00:51:10Z

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py

+
+        if not namespace.admin_password:
+            _prompt_for_password(namespace)
+        _validate_admin_password(namespace.admin_password,


NIT: make 2 parameters in the same line

yugangw-msft · 2018-11-20T00:51:44Z

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py

+
+        validate_ssh_key(namespace)
+        if not namespace.ssh_dest_key_path:
+            namespace.ssh_dest_key_path = \


Unless it is 120 characters plus, make it same line.

I agree. I copied and pasted code from the other blocks without updating. Will make the changes.

Thanks for the catch, @yugangw-msft

yugangw-msft · 2018-11-20T00:52:58Z

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/test_vm_defaults.py

+        self.assertEqual(ns.authentication_type, 'all')
+        self.assertEqual(ns.ssh_dest_key_path, '/home/{}/.ssh/authorized_keys'.format(ns.admin_username))
+
+    def test_linux_with_password_and_ssh_explicit(self):


this is a dupe test :)

Hello Yugang, I will rename the test. The only difference is that the second test sets authentication_type to none

…ion (Azure#7863) * authentication-type can be set to all to permit both ssh key and password authentication * Added tests and updated authentication type validation error. * Added history entry, bumped version. Checked out file recording from dev branch. * Addressed PEP8 issues. * Updated test_vm_defaults auth tests. * Updated other profile's unittests. * Now infers authentication_type, other updates. Do not need to explicitly pass all. * Updated help text. Fix conflict by checking out ephemeral os disk recording from dev branch. * Style changes.

* fix live tests for sas token urls to use datetime (#7866) * Convert test back to scenario test. (#7862) * Remove unused scripts. (#7860) * fix get curren user id azure-graphrbac Breaking change fixes #7839 (#7864) * Use knack 0.5.1. (#7780) * test: make webjob tests record only as create command is unavailable (#7870) * Deprecate expand param. (#7868) * Updated help.py - generate-sas example (#7873) Added MacOS example for generating SAS token with expiration time. The call to the date function `date -d` works on Linux, but not on MacOS. I provided MacOS sample. * Low priority vmss test and help update. (#7882) Updated help text and test location for low priority vmss * Added --force to az vm restart. Added simple test. (#7885) * Fix requests version > 2.20 (#7858) * Bump CLI versions * [vm] Enable password and ssh key authentication during linux VM creation (#7863) * authentication-type can be set to all to permit both ssh key and password authentication * Added tests and updated authentication type validation error. * Added history entry, bumped version. Checked out file recording from dev branch. * Addressed PEP8 issues. * Updated test_vm_defaults auth tests. * Updated other profile's unittests. * Now infers authentication_type, other updates. Do not need to explicitly pass all. * Updated help text. Fix conflict by checking out ephemeral os disk recording from dev branch. * Style changes. * Properly handle parsing of ids from -o tsv on windows. (#7898) * Properly handle parsing of ids from -o tsv on windows. * Removed unused import. * [Storage] bump mgmt sdk version to 3.1.0 and set new api-version to use. (#7869) * changed api-version in recordings and set to new ver of sdk * version bump and history * fix immutability test * re-record all * fixed recordings fix recording * bumped version after release * test: live test fixes in appservice, vm, resource (#7899) * ci: fix build break (#7900) * Updated adls version (#7859) * core: support cross tenant resource provisioning for multi-tenant service principal (#7916) * core: fix the error on matching SP creds (#7923) * resource: fix live test failure of policyset (#7922) * [CI] reenable extension checking in CI (#7933) * reenable extension checking in CI minor edit to get travis to run edit * minor edit * BotService: Bugfixing, code refactoring, reorganization and UX revamping (#7924) * Close #7528. (#7920) * Minor updates to core/generate_ssh_keys and batchai/_generate_ssh_keys (#7895) * [image] create. Add --os-disk-caching parameter. (#7919) * graph: support custom key identifier (#7913) * support key-id description * linter error fixes * consolidate * use official sdk * update history * BotService: fix tests, improve test robustness and update recordings (#7941) * BotService: fix tests, mprove test robustness and update recordings * BotService; fixing tests * BotService: Update recordings * webapp: Adding support for az webapp up (#7930) * core: fix a breaking in kv when run under service principal (#7946) * Disable version check from CI. (#7958) * test: add test coverage for regression from auth (#7949) * core: fix a breaking in kv when run under service principal * test: add test coverage for regression from auth * [AKS] Remove "(PREVIEW)" from AAD arguments (#7960) * [AKS] Remove "(PREVIEW)" from AAD arguments * Bump module version and update HISTORY.rst * Bug fixes for azure-cli-botservice (#7956) * Az bot: fix bug when publishing Node.js bots, fix minor bugs * Az bot: rerecord BotTests * Az bot: fix static check error * [core] Updated location help text (#7951) * Updated location help text. * Update parameters.py * EventHubs help fixes (#7961) * EventHubs help fixes #Fixes 7937. Fixes #7938. * Update _help.py * Fixes for VPN Client Generate (#7962) * Remove mock dependency. * Fix linter issues. * Condense the table format for task list and change all column headers to NAME

Oluwatosin Adewale added 2 commits November 15, 2018 15:34

authentication-type can be all to permit both ssh key and password au…

4b81e24

…thentication

Added tests and updated authentication type validation error.

e14aa49

adewaleo requested a review from yugangw-msft November 16, 2018 02:34

Oluwatosin Adewale added 4 commits November 16, 2018 10:19

Added history entry, bumped version. Checked out file recording from …

a4d43bb

…dev branch.

Addressed PEP8 issues.

8527141

Updated test_vm_defaults auth tests.

dd99cfb

Updated other profile's unittests.

7257cbf

yugangw-msft reviewed Nov 17, 2018

View reviewed changes

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_template_builder.py Show resolved Hide resolved

Oluwatosin Adewale added 2 commits November 19, 2018 12:02

Now infers authentication_type, other updates.

e865c7e

Updated help text.

0f3e2cf

Fix conflict by checking out ephemeral os disk recording from dev branch.

adewaleo force-pushed the vm-password-ssh branch from 9b6a18e to 0f3e2cf Compare November 19, 2018 20:12

Merge branch 'dev' into vm-password-ssh

96593a5

yugangw-msft approved these changes Nov 20, 2018

View reviewed changes

Oluwatosin Adewale and others added 2 commits November 19, 2018 17:24

Style changes.

fa5faa5

Merge branch 'dev' into vm-password-ssh

3ff3b99

adewaleo merged commit b70b6fb into Azure:dev Nov 21, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[vm] Enable password and ssh key authentication during linux VM creation #7863

[vm] Enable password and ssh key authentication during linux VM creation #7863

Uh oh!

adewaleo commented Nov 16, 2018 •

edited

Loading

Uh oh!

Uh oh!

adewaleo commented Nov 20, 2018

Uh oh!

yugangw-msft left a comment

Uh oh!

yugangw-msft Nov 20, 2018

Uh oh!

yugangw-msft Nov 20, 2018

Uh oh!

adewaleo Nov 20, 2018

Uh oh!

adewaleo Nov 20, 2018

Uh oh!

yugangw-msft Nov 20, 2018

Uh oh!

adewaleo Nov 20, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[vm] Enable password and ssh key authentication during linux VM creation #7863

[vm] Enable password and ssh key authentication during linux VM creation #7863

Uh oh!

Conversation

adewaleo commented Nov 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

adewaleo commented Nov 20, 2018

Uh oh!

yugangw-msft left a comment

Choose a reason for hiding this comment

Uh oh!

yugangw-msft Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

yugangw-msft Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

adewaleo Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

adewaleo Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

yugangw-msft Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

adewaleo Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adewaleo commented Nov 16, 2018 •

edited

Loading