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

[SHACK-272] Prefer .ssh/config default values over train's defaults. #215

Merged
merged 2 commits into from
Jun 28, 2018
Merged

[SHACK-272] Prefer .ssh/config default values over train's defaults. #215

merged 2 commits into from
Jun 28, 2018

Conversation

marcparadise
Copy link
Member

@marcparadise marcparadise commented Jun 27, 2018 •
edited
Loading

Description

This change does two things:

  1. If userid, port are not provided but are defined in .ssh/config, or if 'ProxyCommand' is set in .ssh/config, these values will be defaulted to the .ssh/config values for the given host.
  2. We now show username being used for auth in the "Connecting..." message.

Issues Resolved

This covers the remaining work to close out #202

Check List

@marcparadise marcparadise requested a review from a team June 27, 2018 20:32
jonsmorrow
jonsmorrow approved these changes Jun 27, 2018
View reviewed changes
Copy link
Contributor

@jonsmorrow jonsmorrow left a comment

Choose a reason for hiding this comment

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

LGTM.

cheeseplus
cheeseplus approved these changes Jun 27, 2018
View reviewed changes
Copy link

@cheeseplus cheeseplus left a comment

Choose a reason for hiding this comment

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

image

@marcparadise marcparadise force-pushed the SHACK-272/respsect-ssh-config-values branch from 8fc9861 to 16bd211 Compare June 28, 2018 15:52
@marcparadise
Override train-provided defaults for ssh
b9c47db 
Train provides defaults for a subset of connection configuration
options (such as user and port).  If there are values in .ssh/config
for these things, they are not used.

This change makes it so that when ssh configuration exists for a host
we will prefer those defaults to the ones that train provided
if the operator hasn't explicitly provided them on the CLI.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
@marcparadise
Update the 'connecting...' message to include authenticating user
4ff42f0 
To make things more clear ot the operator, update the 'connecting'
message we show when connecting to a host so that it includes the
username being used for the connection.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
@marcparadise marcparadise force-pushed the SHACK-272/respsect-ssh-config-values branch from 16bd211 to 4ff42f0 Compare June 28, 2018 15:53
@marcparadise marcparadise merged commit 8a8e138 into master Jun 28, 2018
@chef-ci chef-ci deleted the SHACK-272/respsect-ssh-config-values branch June 28, 2018 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonsmorrow jonsmorrow jonsmorrow approved these changes

@cheeseplus cheeseplus cheeseplus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marcparadise @cheeseplus @jonsmorrow