Skip to content

fix: Support cloning private repo using ssh key #3678

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

Merged
merged 2 commits into from
Feb 27, 2023
Merged

fix: Support cloning private repo using ssh key #3678

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98afcc4
Accept both git@ and ssh://
claytonparnell Feb 23, 2023
99f5599
Try ssh if PAT/2FA not configured
claytonparnell Feb 23, 2023
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
18 changes: 11 additions & 7 deletions src/sagemaker/git_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def _clone_command_for_github_like(git_config, dest_dir):
CalledProcessError: If failed to clone git repo.
"""
is_https = git_config["repo"].startswith("https://")
is_ssh = git_config["repo"].startswith("git@")
is_ssh = git_config["repo"].startswith("git@") or git_config["repo"].startswith("ssh://")
if not is_https and not is_ssh:
raise ValueError("Invalid Git url provided.")
if is_ssh:
Expand Down Expand Up @@ -277,12 +277,16 @@ def _run_clone_command(repo_url, dest_dir):
if repo_url.startswith("https://"):
my_env["GIT_TERMINAL_PROMPT"] = "0"
subprocess.check_call(["git", "clone", repo_url, dest_dir], env=my_env)
elif repo_url.startswith("git@"):
with tempfile.NamedTemporaryFile() as sshnoprompt:
with open(sshnoprompt.name, "w") as write_pipe:
write_pipe.write("ssh -oBatchMode=yes $@")
os.chmod(sshnoprompt.name, 0o511)
my_env["GIT_SSH"] = sshnoprompt.name
elif repo_url.startswith("git@") or repo_url.startswith("ssh://"):
try:
with tempfile.NamedTemporaryFile() as sshnoprompt:
with open(sshnoprompt.name, "w") as write_pipe:
write_pipe.write("ssh -oBatchMode=yes $@")
os.chmod(sshnoprompt.name, 0o511)
my_env["GIT_SSH"] = sshnoprompt.name
subprocess.check_call(["git", "clone", repo_url, dest_dir], env=my_env)
except subprocess.CalledProcessError:
del my_env["GIT_SSH"]
subprocess.check_call(["git", "clone", repo_url, dest_dir], env=my_env)


Expand Down