Correctly use port specified in the SSH config file in the remote SSH runner #4661
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
one is provided in the SSH config and it doesn't match a default port. Part of #4660.
We now only support Paramiko based remote runner. Fabric one has been removed and deprecated a long time ago.
port for indiviual entries) and don't default port to 22 in the runner metadata to avoid issues with default values.
|
I made a change so we don't include a default value for the This is the same approach we use for other default values which can also be read from the config (username, port, etc.) and it's more robust since it means it covers and works correctly in all the scenarios. |
Kami
commented
May 6, 2019
| @@ -6,8 +6,7 @@ | |||
| runner_parameters: | |||
| bastion_host: | |||
| description: 'The host SSH connections will be proxied through. Note: This connection | |||
| is made using the same parameters as the final connection, and is only used | |||
There was a problem hiding this comment.
This description was old and out of date since we don't use fabric runner for a long time anymore.
jinpingh
approved these changes
May 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request updates / fixes remote command and script runner to correctly use SSH port specified in the SSH config file if a non-default port is specified in the SSH config file and if SSH config file functionality is enabled (
ssh_runner.use_ssh_configst2.conf config option is set toTrue).NOTE: Due to the way of how we specify and handle default parameter values in the runner metadata file, this change is not 100% ideal, but it should cover most scenarios (Current code make it impossible to distinguish if a default parameter value is used or if user specified a value which matches a default value. Changing this would be more involved and also involves other parameters).
Resolves #4660.