git module/state: Handle identity files more gracefully #30894
Merged
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
This is a common function to raise exceptions encountered trying to read from a file.
This ensures that a matching entry in a local ssh_config (~/.ssh/config) doesn't override the "-i" parameter.
This adds missing try/except blocks to ensure that a failed git ssh auth doesn't cause a traceback. It also adds information to the documentation for the "identity" param which explains that passphraseless keys cannot be used unless Salt is invoked using salt-call.
terminalmage
force-pushed
the
issue30858
branch
from
12d5a5e
to
8909d43
Compare
|
Test failure is unrelated. |
These changes did not make it in before v2015.8.6 was tagged.
cachedout
pushed a commit
that referenced
this pull request
Feb 4, 2016
git module/state: Handle identity files more gracefully
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 does the following:
~/.ssh/configcontaining anIdentityFileparam will override the-iargument in the wrapper and prevent the desired identity file from being used.saltinstead ofsalt-callblocks waiting for user input.__opts__['__cli']is now inspected to determine how Salt was invoked, and a new remote execution functionssh.key_is_encryptedhas been added to check a private key to see if it is protected by a passphrase.identityparam were missing try/except blocks to catch exceptions raised when git ssh authentication fails. These have now been added, and a couple DRY functions have been added for gracefully failing the state when specific actions that are attempted in more than one place within thegit.lateststate fail.