Skip to content

Commit

Permalink
[ssh] Upgrade Version for Release (#5485)
Browse files Browse the repository at this point in the history
  • Loading branch information
vthiebaut10 authored Oct 26, 2022
1 parent 33e4093 commit e99e7e5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/ssh/azext_ssh/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def _assert_args(resource_group, vm_name, ssh_ip, resource_type, cert_file, user
raise azclierror.InvalidArgumentValueError("--resource-type must be either "
"\"Microsoft.Compute/virtualMachines\", "
"\"Microsoft.HybridCompute/machines\", "
"or \"Microsoft.ConnectedVMwareSphere/virtualMachines\".")
"or \"Microsoft.ConnectedVMwarevSphere/virtualMachines\".")

if not (resource_group or vm_name or ssh_ip):
raise azclierror.RequiredArgumentMissingError(
Expand Down
6 changes: 2 additions & 4 deletions src/ssh/azext_ssh/ssh_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ def start_ssh_connection(op_info, delete_keys, delete_cert):
# Redirecting stderr:
# 1. Read SSH logs to determine if authentication was successful so credentials can be deleted
# 2. Read SSHProxy error messages to print friendly error messages for well known errors.
# On Linux when connecting to a local user on a host with a banner, output gets messed up if stderr redirected.
# When connecting to a local user on a host with a banner, output gets messed up if stderr redirected.
# If user expects logs to be printed, do not redirect logs. In some ocasions output gets messed up.
is_local_user_on_linux = (platform.system() != 'Windows' and not delete_cert)
redirect_stderr = set(['-v', '-vv', '-vvv']).isdisjoint(ssh_arg_list) and \
(op_info.is_arc or delete_cert or op_info.delete_credentials) and \
not is_local_user_on_linux
(delete_cert or op_info.delete_credentials)

if redirect_stderr:
ssh_arg_list = ['-v'] + ssh_arg_list
Expand Down
2 changes: 1 addition & 1 deletion src/ssh/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from setuptools import setup, find_packages

VERSION = "1.1.2"
VERSION = "1.1.3"

CLASSIFIERS = [
'Development Status :: 4 - Beta',
Expand Down

0 comments on commit e99e7e5

Please sign in to comment.