Merge lp:~asbalderson/jenkins-launchpad-plugin/private-repo into lp:jenkins-launchpad-plugin

[Alexander Balderson]

Use git+ssh url's for all autoland operations.

When trying to autoland against repo's which are private on launchpad,
the https_url doesnt exist. Use the git+ssh url instead for those
operations. Because the user performing autoland operations has
access to push to the repo, it should also have access to clone as well.

I suspect the reason the https url was used originally was to ensure that the wrong repo couldnt be pushed to, but that's what automation is for. which should ensure we dont accidentally push incorrectly.

[Joshua Powers (powersj)]

review: Approve

[lp:~asbalderson/jenkins-launchpad-plugin/private-repo]

145. By Joshua Powers on 2019-03-15

Use git+ssh url's for all autoland operations.

When trying to autoland against repo's which are private on launchpad,
the https_url doesnt exist. Use the git+ssh url instead for those
operations. Because the user performing autoland operations has
access to push to the repo, it should also have access to clone as well.

=== modified file 'jlp/commands/autoland.py'
--- jlp/commands/autoland.py	2018-07-31 15:57:38 +0000
+++ jlp/commands/autoland.py	2019-03-15 16:41:46 +0000
@@ -107,6 +107,17 @@
         return _merge_and_commit_bzr(mp, args)
 
 
+def _get_user_and_git_ssh_url(url):
+    """Create a git+ssh://[e-mail]/repo like url.
+    
+    @param url: a git+ssh url without a user
+    @return: a git+ssh with user url
+    """
+    return url.replace(
+        'ssh://', 'ssh://%s@' % get_config_option('launchpad_login')
+    )
+
+
 def _git_source_info(mp):
     """Get the current sha, author, and email of the source branch.
 
@@ -116,7 +127,7 @@
     tmp_dir = tempfile.mkdtemp()
     try:
         proposal = git.Repo.clone_from(
-            mp.source_git_repository.git_https_url,
+            _get_user_and_git_ssh_url(mp.source_git_repository.git_ssh_url),
             tmp_dir, branch=get_source_branch(mp))
         revid = proposal.head.object.hexsha
         author = proposal.head.commit.author.name
@@ -189,13 +200,10 @@
                          args, LaunchpadVote.NEEDS_FIXING)
         return 1
 
-    # create a git+ssh://[e-mail]/repo like url
-    url = mp.target_git_repository.git_ssh_url.replace(
-        'ssh://', 'ssh://%s@' % get_config_option('launchpad_login')
-    )
+    url = _get_user_and_git_ssh_url(mp.target_git_repository.git_ssh_url)
     target = git.Repo.clone_from(url, git_dir, branch=get_target_branch(mp))
     source = target.create_remote(
-        'source', mp.source_git_repository.git_https_url
+        'source', _get_user_and_git_ssh_url(mp.source_git_repository.git_ssh_url)
     )
     source.fetch()