Refactor a lot of the build create code out into a common method. Add an endpoint for manually starting triggers.

endpoints/trigger.py

@@ -86,6 +86,12 @@ class BuildTrigger(object):
     """
     raise NotImplementedError
 
+  def manual_start(self, auth_token, config):
+    """
+    Manually creates a repository build for this trigger.
+    """
+    raise NotImplementedError
+
   @classmethod
   def service_name(cls):
     """
@@ -137,6 +143,7 @@ class GithubBuildTrigger(BuildTrigger):
     try:
       hook = to_add_webhook.create_hook('web', webhook_config)
       config['hook_id'] = hook.id
+      config['master_branch'] = to_add_webhook.master_branch
     except GithubException:
       msg = 'Unable to create webhook on repository: %s'
       raise TriggerActivationException(msg % new_build_source)
@@ -206,27 +213,10 @@ class GithubBuildTrigger(BuildTrigger):
       msg = 'Unable to list contents of repository: %s' % source
       raise EmptyRepositoryException(msg)
 
-  def handle_trigger_request(self, request, auth_token, config):
-    payload = request.get_json()
-
-    if 'zen' in payload:
-      raise ValidationRequestException()
-
-    logger.debug('Payload %s', payload)
-    ref = payload['ref']
-    commit_sha = payload['head_commit']['id']
-    short_sha = commit_sha[0:7]
-
-    gh_client = self._get_client(auth_token)
-
-    repo_full_name = '%s/%s' % (payload['repository']['owner']['name'],
-                                payload['repository']['name'])
-    repo = gh_client.get_repo(repo_full_name)
-
-    logger.debug('Github repo: %s', repo)
-
+  @staticmethod
+  def _prepare_build(config, repo, commit_sha, build_name, ref):
     # Prepare the download and upload URLs
-    archive_link = repo.get_archive_link('zipball', short_sha)
+    archive_link = repo.get_archive_link('zipball', commit_sha)
     download_archive = client.get(archive_link, stream=True)
 
     zipball_subdir = ''
@@ -243,9 +233,9 @@ class GithubBuildTrigger(BuildTrigger):
     logger.debug('Successfully prepared job')
 
     # compute the tag(s)
-    pushed_branch = ref.split('/')[-1]
-    tags = {pushed_branch}
-    if pushed_branch == repo.master_branch:
+    branch = ref.split('/')[-1]
+    tags = {branch}
+    if branch == repo.master_branch:
       tags.add('latest')
     logger.debug('Pushing to tags: %s' % tags)
 
@@ -254,4 +244,43 @@ class GithubBuildTrigger(BuildTrigger):
     joined_subdir = os.path.join(zipball_subdir, repo_subdir)
     logger.debug('Final subdir: %s' % joined_subdir)
 
-    return dockerfile_id, list(tags), short_sha, joined_subdir
+    return dockerfile_id, list(tags), build_name, joined_subdir
+
+  @staticmethod
+  def get_display_name(sha):
+    return sha[0:7]
+
+  def handle_trigger_request(self, request, auth_token, config):
+    payload = request.get_json()
+
+    if 'zen' in payload:
+      raise ValidationRequestException()
+
+    logger.debug('Payload %s', payload)
+    ref = payload['ref']
+    commit_sha = payload['head_commit']['id']
+    short_sha = GithubBuildTrigger.get_display_name(commit_sha)
+
+    gh_client = self._get_client(auth_token)
+
+    repo_full_name = '%s/%s' % (payload['repository']['owner']['name'],
+                                payload['repository']['name'])
+    repo = gh_client.get_repo(repo_full_name)
+
+    logger.debug('Github repo: %s', repo)
+
+    return GithubBuildTrigger._prepare_build(config, repo, commit_sha,
+                                             short_sha, ref)
+
+  def manual_start(self, auth_token, config):
+    source = config['build_source']
+    subdir = config['subdir']
+
+    gh_client = self._get_client(auth_token)
+    repo = gh_client.get_repo(source)
+    master = repo.get_branch(repo.master_branch)
+    master_sha = master.commit.sha
+    short_sha = GithubBuildTrigger.get_display_name(master_sha)
+    ref = 'refs/heads/%s' % repo.master_branch
+
+    return self._prepare_build(config, repo, master_sha, short_sha, ref)