Start refactoring of the trigger system:

- Move each trigger handler into its own file
- Add dictionary helper classes for easier reading and writing of dict-based data
- Extract the web hook payload -> internal representation building for each trigger system
- Add tests for this transformation
- Remove support for Github archived-based building

endpoints/api/build.py

@@ -9,12 +9,12 @@ from flask import request
 from rfc3987 import parse as uri_parse
 
 from app import app, userfiles as user_files, build_logs, log_archive, dockerfile_build_queue
+from buildtrigger.basehandler import BuildTriggerHandler
 from endpoints.api import (RepositoryParamResource, parse_args, query_param, nickname, resource,
                            require_repo_read, require_repo_write, validate_json_request,
                            ApiResource, internal_only, format_date, api, Unauthorized, NotFound,
                            path_param, InvalidRequest, require_repo_admin)
 from endpoints.building import start_build, PreparedBuild
-from endpoints.trigger import BuildTriggerHandler
 from data import database
 from data import model
 from auth.auth_context import get_authenticated_user

endpoints/api/trigger.py

@@ -8,15 +8,16 @@ from urllib import quote
 from urlparse import urlunparse
 
 from app import app
+from buildtrigger.basehandler import BuildTriggerHandler
+from buildtrigger.triggerutil import (TriggerDeactivationException,
+                                      TriggerActivationException, EmptyRepositoryException,
+                                      RepositoryReadException, TriggerStartException)
 from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin,
                            log_action, request_error, query_param, parse_args, internal_only,
                            validate_json_request, api, Unauthorized, NotFound, InvalidRequest,
                            path_param)
 from endpoints.api.build import build_status_view, trigger_view, RepositoryBuildStatus
 from endpoints.building import start_build
-from endpoints.trigger import (BuildTriggerHandler, TriggerDeactivationException,
-                               TriggerActivationException, EmptyRepositoryException,
-                               RepositoryReadException, TriggerStartException)
 from data import model
 from auth.permissions import (UserAdminPermission, AdministerOrganizationPermission,
                               ReadRepositoryPermission)

endpoints/bitbuckettrigger.py

@@ -3,7 +3,8 @@ import logging
 from flask import request, redirect, url_for, Blueprint
 from flask.ext.login import current_user
 
-from endpoints.trigger import BitbucketBuildTrigger, BuildTriggerHandler
+from buildtrigger.basehandler import BuildTriggerHandler
+from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
 from endpoints.common import route_show_if
 from app import app
 from data import model

endpoints/building.py

@@ -96,7 +96,7 @@ class PreparedBuild(object):
   def get_display_name(sha):
     return sha[0:7]
 
-  def tags_from_ref(self, ref, default_branch='master'):
+  def tags_from_ref(self, ref, default_branch=None):
     branch = ref.split('/')[-1]
     tags = {branch}
 

endpoints/web.py

@@ -21,8 +21,12 @@ from util.cache import no_cache
 from endpoints.common import common_login, render_page_template, route_show_if, param_required
 from endpoints.decorators import anon_protect
 from endpoints.csrf import csrf_protect, generate_csrf_token, verify_csrf
-from endpoints.trigger import (CustomBuildTrigger, BitbucketBuildTrigger, TriggerProviderException,
-                               BuildTriggerHandler)
+
+from buildtrigger.customhandler import CustomBuildTrigger
+from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
+from buildtrigger.triggerutil import TriggerProviderException
+from buildtrigger.basehandler import BuildTriggerHandler
+
 from util.names import parse_repository_name, parse_repository_name_and_tag
 from util.useremails import send_email_changed
 from util.systemlogs import build_logs_archive

endpoints/webhooks.py

@@ -9,8 +9,9 @@ from auth.permissions import ModifyRepositoryPermission
 from util.invoice import renderInvoiceToHtml
 from util.useremails import send_invoice_email, send_subscription_change, send_payment_failed
 from util.http import abort
-from endpoints.trigger import (BuildTriggerHandler, ValidationRequestException,
-                               SkipRequestException, InvalidPayloadException)
+from buildtrigger.basehandler import BuildTriggerHandler
+from buildtrigger.triggerutil import (ValidationRequestException,  SkipRequestException,
+                                      InvalidPayloadException)
 from endpoints.building import start_build