Skip to content

Fix pipe-cli add --no-putty for --ssh #4090

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix pipe-cli add --no-putty for --ssh #4090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pipe-cli/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/Pipeline_CLI.egg-info
/.gradle
/.codemie
/.history
/.idea
/build
/dist
*.pyc
Expand Down
7 changes: 5 additions & 2 deletions pipe-cli/pipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def enable_debug_logging(ctx, param, value):
try:
from http.client import HTTPConnection # py3
except ImportError:
# noinspection PyUnresolvedReferences
from httplib import HTTPConnection # py2
HTTPConnection.debuglevel = 5
log_level = logging.DEBUG
Expand Down Expand Up @@ -1810,6 +1811,8 @@ def start_tunnel_options(decorating_func):
help='Socket connection timeout in seconds.')
@click.option('-s', '--ssh', required=False, is_flag=True, default=False,
help='Configures passwordless ssh to specified run instance.')
@click.option('--no-putty', 'ssh_putty', required=False, default=True, is_flag=True, flag_value=False,
help='Disables putty installation and configuration for passwordless ssh.')
@click.option('-sp', '--ssh-path', required=False, type=str,
help='Path to .ssh directory for passwordless ssh configuration on Linux.')
@click.option('-sh', '--ssh-host', required=False, type=str,
Expand Down Expand Up @@ -1871,7 +1874,7 @@ def parse_tunnel_args(args):
@start_tunnel_options
@common_options
def start_tunnel(host_id, local_port, remote_port, connection_timeout,
ssh, ssh_path, ssh_host, ssh_user, ssh_keep, direct, log_file, log_level,
ssh, ssh_putty, ssh_path, ssh_host, ssh_user, ssh_keep, direct, log_file, log_level,
timeout, timeout_stop, foreground,
keep_existing, keep_same, replace_existing, replace_different, ignore_owner, ignore_existing,
retries, region):
Expand Down Expand Up @@ -1954,7 +1957,7 @@ def start_tunnel(host_id, local_port, remote_port, connection_timeout,
CP_CLI_TUNNEL_SERVER_ADDRESS - tunnel server address
"""
create_tunnel(host_id, local_port, remote_port, connection_timeout,
ssh, ssh_path, ssh_host, ssh_user, ssh_keep, direct, log_file, log_level,
ssh, ssh_putty, ssh_path, ssh_host, ssh_user, ssh_keep, direct, log_file, log_level,
timeout, timeout_stop, foreground,
keep_existing, keep_same, replace_existing, replace_different, ignore_owner, ignore_existing,
retries, region, parse_tunnel_args)
Expand Down
Loading