Get UI for activating github build triggers in place and working. Note that the actual server-side activation is still not done (but the proper method is invoked)

endpoints/api.py

@@ -25,8 +25,11 @@ from auth.permissions import (ReadRepositoryPermission,
                               CreateRepositoryPermission,
                               AdministerOrganizationPermission,
                               OrganizationMemberPermission,
-                              ViewTeamPermission)
+                              ViewTeamPermission,
+                              UserPermission
+                              )
 from endpoints.common import common_login, get_route_data
+from endpoints.trigger import BuildTrigger, TriggerActivationException
 from util.cache import cache_control
 from datetime import datetime, timedelta
 
@@ -1120,11 +1123,14 @@ def get_repo(namespace, repository):
 
 def trigger_view(trigger):
   if trigger and trigger.uuid:  
+    config_dict = json.loads(trigger.config)
+    build_trigger = BuildTrigger.get_trigger_for_service(trigger.service.name)
     return {
       'service': trigger.service.name,
-      'config': json.loads(trigger.config),
+      'config': config_dict,
       'id': trigger.uuid,
       'connected_user': trigger.connected_user.username,
+      'is_active': build_trigger.is_active(config_dict)
     }
 
   return None
@@ -1358,6 +1364,44 @@ def get_build_trigger(namespace, repository, trigger_uuid):
   abort(403)  # Permission denied
 
 
+@api.route('/repository/<path:repository>/trigger/<trigger_uuid>/activate',
+           methods=['POST'])
+@api_login_required
+@parse_repository_name
+def activate_build_trigger(namespace, repository, trigger_uuid):
+  permission = AdministerRepositoryPermission(namespace, repository)
+  if permission.can():
+    try:
+      trigger = model.get_build_trigger(namespace, repository, trigger_uuid)
+    except model.InvalidBuildTriggerException:
+      abort(404)
+      return
+
+    handler = BuildTrigger.get_trigger_for_service(trigger.service.name)
+    existing_config_dict = json.loads(trigger.config)
+    if handler.is_active(existing_config_dict):
+      abort(400)
+      return
+
+    user_permission = UserPermission(trigger.connected_user.username)
+    if user_permission.can():
+      new_config_dict = request.get_json()
+
+      try:
+        handler.activate(trigger.auth_token, new_config_dict)
+      except TriggerActivationException as e:
+        abort(400, message = e.msg)
+        return
+
+      # Save the updated config.
+      trigger.config = json.dumps(new_config_dict)
+      trigger.save()
+
+      return jsonify(trigger_view(trigger))
+
+  abort(403)  # Permission denied
+
+
 @api.route('/repository/<path:repository>/trigger/<trigger_uuid>/builds',
            methods=['GET'])
 @api_login_required
@@ -1374,6 +1418,31 @@ def list_trigger_recent_builds(namespace, repository, trigger_uuid):
 
   abort(403)  # Permission denied
 
+
+@api.route('/repository/<path:repository>/trigger/<trigger_uuid>/sources',
+           methods=['GET'])
+@api_login_required
+@parse_repository_name
+def list_trigger_build_sources(namespace, repository, trigger_uuid):
+  permission = AdministerRepositoryPermission(namespace, repository)
+  if permission.can():
+    try:
+      trigger = model.get_build_trigger(namespace, repository, trigger_uuid)
+    except model.InvalidBuildTriggerException:
+      abort(404)
+
+    user_permission = UserPermission(trigger.connected_user.username)
+    if user_permission.can():
+      trigger_handler = BuildTrigger.get_trigger_for_service(trigger.service.name)
+        
+      return jsonify({
+        'sources': trigger_handler.list_build_sources(trigger.auth_token)
+      })
+
+  abort(403)  # Permission denied
+
+
+
 @api.route('/repository/<path:repository>/trigger/', methods=['GET'])
 @api_login_required
 @parse_repository_name

endpoints/callbacks.py

@@ -123,10 +123,10 @@ def attach_github_build_trigger(namespace, repository):
       msg = 'Invalid repository: %s/%s' % (namespace, repository)
       abort(404, message=msg)
 
-    model.create_build_trigger(repo, 'github', token, current_user.db_user())
+    trigger = model.create_build_trigger(repo, 'github', token, current_user.db_user())
     admin_path = '%s/%s/%s' % (namespace, repository, 'admin')
-    full_url = url_for('web.repository', path=admin_path) + '?tab=trigger'
+    full_url = url_for('web.repository', path=admin_path) + '?tab=trigger&new_trigger=' + trigger.uuid
     logger.debug('Redirecting to full url: %s' % full_url)
     return redirect(full_url)
 
-  abort(403)
+  abort(403)

endpoints/trigger.py

@@ -21,10 +21,12 @@ CHUNK_SIZE = 512 * 1024
 class BuildArchiveException(Exception):
   pass
 
-
 class InvalidServiceException(Exception):
   pass
 
+class TriggerActivationException(Exception):
+  pass
+
 
 class BuildTrigger(object):
   def __init__(self):
@@ -43,6 +45,18 @@ class BuildTrigger(object):
     """
     raise NotImplementedError
 
+  def is_active(self, config):
+    """
+    Returns True if the current build trigger is active. Inactive means further setup is needed.
+    """
+    raise NotImplementedError
+
+  def activate(self, auth_token, config):
+    """ 
+    Activates the trigger for the service, with the given new configuration.
+    """
+    raise NotImplementedError
+
   @classmethod
   def service_name(cls):
     """
@@ -73,15 +87,43 @@ class GithubBuildTrigger(BuildTrigger):
   def service_name(cls):
     return 'github'
 
+  def is_active(self, config):
+    return 'build_source' in config and len(config['build_source']) > 0
+
+  def activate(self, auth_token, config):
+    # TODO: Add the callback web hook to the github repository.
+    pass
+
   def list_build_sources(self, auth_token):
     gh_client = self._get_client(auth_token)
     usr = gh_client.get_user()
 
-    repo_list = [repo.full_name for repo in usr.get_repos()]
-    for org in usr.get_orgs():
-      repo_list.extend((repo.full_name for repo in org.get_repos()))
+    personal = {
+      'personal': True,
+      'repos': [repo.full_name for repo in usr.get_repos()],
+      'info': {
+        'name': usr.login,
+        'avatar_url': usr.avatar_url,
+      }
+    }
 
-    return repo_list
+    repos_by_org = [personal]
+
+    for org in usr.get_orgs():
+      repo_list = []
+      for repo in org.get_repos():
+        repo_list.append(repo.full_name)
+
+      repos_by_org.append({
+        'personal': False,
+        'repos': repo_list,
+        'info': {
+          'name': org.name,
+          'avatar_url': org.avatar_url
+        }
+      })
+
+    return repos_by_org
 
   def handle_trigger_request(self, request, auth_token, config):
     payload = request.get_json()
@@ -110,4 +152,4 @@ class GithubBuildTrigger(BuildTrigger):
 
     logger.debug('Successfully prepared job')
 
-    return dockerfile_id, branch_name, commit_id
+    return dockerfile_id, branch_name, commit_id