Mac: Nice warning if you don't have an identity #637
Merged
Conversation
This file contains hidden or 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
Supporting `--all` on mac is "fun" because we rely on ssh auth and, unlike Linux's lovely bind mounts, macOS can't share the ssh authorization directly. Instead we have to carefully bounce the ssh authorization into the container by `ssh`ing into it. One of the steps in this process requires that the user has an ssh identity configured with their agent. This is fairly easy to do, but if you haven't done it the error message was garbage. This catches the original message from `ssh-add` and sends the user a nicer one that includes a link to instructions.
lcawl
approved these changes
Feb 22, 2019
ddillinger
reviewed
Feb 22, 2019
| @@ -37,6 +37,7 @@ import time | |||
| import webbrowser | |||
|
|
|||
| DOCKER_BUILD_QUIET_TIME = 3 # seconds | |||
| SSH_AGENT_HELP = 'https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent' # noqa | |||
There was a problem hiding this comment.
It tells pycodestyle to ignore the super long line.
build_docs
Outdated
| @@ -250,6 +251,10 @@ def forward_ssh_auth_into_container(container, docker_run): | |||
| handle_popen(get_ssh_public_key, record_public_key) | |||
| keys = "\n".join(public_keys) + "\n" | |||
| if get_ssh_public_key.returncode != 0: | |||
| if 'The agent has no identities.' in keys: | |||
| raise ArgError('-all requires an identity be registered with the ' | |||
ddillinger
approved these changes
Feb 23, 2019
|
Thanks for reviewing @lcawl and @ddillinger! |
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.
Supporting
--allon mac is "fun" because we rely on ssh auth and, unlikeLinux's lovely bind mounts, macOS can't share the ssh authorization
directly. Instead we have to carefully bounce the ssh authorization into
the container by
sshing into it. One of the steps in this processrequires that the user has an ssh identity configured with their agent.
This is fairly easy to do, but if you haven't done it the error message
was garbage. This catches the original message from
ssh-addand sendsthe user a nicer one that includes a link to instructions.