Skip to content

Minor updates to core/generate_ssh_keys and batchai/_generate_ssh_keys #7895

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

Merged
yugangw-msft merged 5 commits into from
Nov 29, 2018
Merged

Minor updates to core/generate_ssh_keys and batchai/_generate_ssh_keys #7895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdda1ef
Minor updates to core/keys/generate_ssh_keys and batchai/custom/_gene…
Nov 20, 2018
46a594f
Version bumps.
Nov 21, 2018
69abc50
Merge branch 'dev' into ssh-remove-redundant-checks
adewaleo Nov 21, 2018
a1e17b7
Removed duplicate history entries
Nov 22, 2018
2edd486
Merge branch 'dev' into ssh-remove-redundant-checks
adewaleo Nov 26, 2018
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
1 change: 1 addition & 0 deletions src/azure-cli-core/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Release History
===============

2.0.52
++++++
* Fix bug where ids piped from a command with tsv output is improperly parsed.
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def generate_ssh_keys(private_key_filepath, public_key_filepath):
try:
key = paramiko.RSAKey(filename=private_key_filepath)
logger.warning("Private SSH key file '%s' was found in the directory: '%s'. "
"We will generate a paired public key file '%s'",
"A paired public key file '%s' will be generated.",
private_key_filepath, ssh_dir, public_key_filepath)
except (PasswordRequiredException, SSHException, IOError) as e:
raise CLIError(e)
Expand Down
10 changes: 2 additions & 8 deletions src/command_modules/azure-cli-batchai/azure/cli/command_modules/batchai/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,15 +605,9 @@ def _generate_ssh_keys():
"""Generates ssh keys pair"""
private_key_path = os.path.join(os.path.expanduser('~'), '.ssh', 'id_rsa')
public_key_path = os.path.join(os.path.expanduser('~'), '.ssh', 'id_rsa.pub')
if os.path.exists(private_key_path) and os.path.exists(public_key_path):
logger.warning('Reusing existing ssh public key from ~/.ssh')
return
if os.path.exists(private_key_path):
logger.warning('SSH private key id_rsa exists but public key is missing. Please export the public key.')
return
keys.generate_ssh_keys(private_key_path, public_key_path)
logger.warning('SSH key files id_rsa and id_rsa.pub have been generated under ~/.ssh to allow SSH access to the '
'nodes. If using machines without permanent storage, back up your keys to a safe location.')
logger.warning('Attempted to find or generate SSH key files id_rsa and id_rsa.pub under ~/.ssh to allow SSH access '
Copy link
Contributor

@yugangw-msft yugangw-msft Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not so sure we need this warning any more, as azure-cli-core already emits out a warning based the context, right?

Copy link
Contributor Author

@adewaleo adewaleo Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it does in most cases. However, with this change no message will be printed if a new private key file is generated. In the past there was always a message printed. Still, this should be expected as the help text for --generate-ssh-keys in az batchai cluster/file-server create -h says: "Generate SSH public and private key files in ~/.ssh directory (if missing)."

Copy link
Contributor Author

@adewaleo adewaleo Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will go ahead and remove this warning.

'to the nodes. If using machines without permanent storage, back up your keys to a safe location.')


def list_workspaces(client, resource_group=None):
Expand Down