ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-03-03 10:42:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When using force ssh protocol, only enforce on git_host if provided, otherwise apply everywhere

Browse Source
This commit is contained in:
allegroai 2020-10-05 18:26:21 +03:00
parent 6cbfb96ff8
commit 234d5fac2c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trains_agent/helper/repo.py
View File

@ -278,6 +278,11 @@ class VCS(object):
""" """
if self.session.config.get('agent.force_git_ssh_protocol', None) and self.url: if self.session.config.get('agent.force_git_ssh_protocol', None) and self.url:
parsed_url = furl(self.url) parsed_url = furl(self.url)
# only apply to a specific domain (if requested)
config_domain = \
ENV_AGENT_GIT_HOST.get() or self.session.config.get("agent.git_host", None)
if config_domain and config_domain != parsed_url.host:
return
if parsed_url.scheme == "https": if parsed_url.scheme == "https":
new_url = self.replace_http_url( new_url = self.replace_http_url(
self.url, port=self.session.config.get('agent.force_git_ssh_port', None)) self.url, port=self.session.config.get('agent.force_git_ssh_port', None))
@ -295,6 +300,12 @@ class VCS(object):
(ENV_AGENT_GIT_USER.get() or self.session.config.get('agent.git_user', None)) and (ENV_AGENT_GIT_USER.get() or self.session.config.get('agent.git_user', None)) and
(ENV_AGENT_GIT_PASS.get() or self.session.config.get('agent.git_pass', None)) (ENV_AGENT_GIT_PASS.get() or self.session.config.get('agent.git_pass', None))
): ):
# only apply to a specific domain (if requested)
config_domain = \
ENV_AGENT_GIT_HOST.get() or self.session.config.get("git_host", None)
if config_domain and config_domain != furl(self.url).host:
return
new_url = self.replace_ssh_url(self.url) new_url = self.replace_ssh_url(self.url)
if new_url != self.url: if new_url != self.url:
print("Using user/pass credentials - replacing ssh url '{}' with https url '{}'".format( print("Using user/pass credentials - replacing ssh url '{}' with https url '{}'".format(