- Fix initdb

- Add ability to specific custom fields for manual running of build triggers and add a "branch name" selector for running github builds

endpoints/api/trigger.py

@@ -14,7 +14,7 @@ from endpoints.api.build import (build_status_view, trigger_view, RepositoryBuil
 from endpoints.common import start_build
 from endpoints.trigger import (BuildTrigger as BuildTriggerBase, TriggerDeactivationException,
                                TriggerActivationException, EmptyRepositoryException,
-                               RepositoryReadException)
+                               RepositoryReadException, TriggerStartException)
 from data import model
 from auth.permissions import UserAdminPermission, AdministerOrganizationPermission, ReadRepositoryPermission
 from util.names import parse_robot_username
@@ -374,9 +374,24 @@ class BuildTriggerAnalyze(RepositoryParamResource):
 @resource('/v1/repository/<repopath:repository>/trigger/<trigger_uuid>/start')
 class ActivateBuildTrigger(RepositoryParamResource):
   """ Custom verb to manually activate a build trigger. """
+  schemas = {
+    'RunParameters': {
+      'id': 'RunParameters',
+      'type': 'object',
+      'description': 'Optional run parameters for activating the build trigger',
+      'additional_properties': False,
+      'properties': {
+        'branch_name': {
+          'type': 'string',
+          'description': '(GitHub Only) If specified, the name of the GitHub branch to build.'
+        }
+      }
+    }
+  }
 
   @require_repo_admin
   @nickname('manuallyStartBuildTrigger')
+  @validate_json_request('RunParameters')
   def post(self, namespace, repository, trigger_uuid):
     """ Manually start a build from the specified trigger. """
     try:
@@ -389,14 +404,18 @@ class ActivateBuildTrigger(RepositoryParamResource):
     if not handler.is_active(config_dict):
       raise InvalidRequest('Trigger is not active.')
 
-    specs = handler.manual_start(trigger.auth_token, config_dict)
-    dockerfile_id, tags, name, subdir = specs
+    try:
+      run_parameters = request.get_json()
+      specs = handler.manual_start(trigger.auth_token, config_dict, run_parameters=run_parameters)
+      dockerfile_id, tags, name, subdir = specs
 
-    repo = model.get_repository(namespace, repository)
-    pull_robot_name = model.get_pull_robot_name(trigger)
+      repo = model.get_repository(namespace, repository)
+      pull_robot_name = model.get_pull_robot_name(trigger)
 
-    build_request = start_build(repo, dockerfile_id, tags, name, subdir, True,
-                                pull_robot_name=pull_robot_name)
+      build_request = start_build(repo, dockerfile_id, tags, name, subdir, True,
+                                  pull_robot_name=pull_robot_name)
+    except TriggerStartException as tse:
+      raise InvalidRequest(tse.message)
 
     resp = build_status_view(build_request, True)
     repo_string = '%s/%s' % (namespace, repository)
@@ -424,6 +443,36 @@ class TriggerBuildList(RepositoryParamResource):
     }
 
 
+
+@resource('/v1/repository/<repopath:repository>/trigger/<trigger_uuid>/fields/<field_name>')
+@internal_only
+class BuildTriggerFieldValues(RepositoryParamResource):
+  """ Custom verb to fetch a values list for a particular field name. """
+  @require_repo_admin
+  @nickname('listTriggerFieldValues')
+  def get(self, namespace, repository, trigger_uuid, field_name):
+    """ List the field values for a custom run field. """
+    try:
+      trigger = model.get_build_trigger(namespace, repository, trigger_uuid)
+    except model.InvalidBuildTriggerException:
+      raise NotFound()
+
+    user_permission = UserAdminPermission(trigger.connected_user.username)
+    if user_permission.can():
+      trigger_handler = BuildTriggerBase.get_trigger_for_service(trigger.service.name)
+      values = trigger_handler.list_field_values(trigger.auth_token, json.loads(trigger.config),
+                                                 field_name)
+
+      if values is None:
+        raise NotFound()
+        
+      return {
+        'values': values
+      }
+    else:
+      raise Unauthorized()
+
+
 @resource('/v1/repository/<repopath:repository>/trigger/<trigger_uuid>/sources')
 @internal_only
 class BuildTriggerSources(RepositoryParamResource):

endpoints/trigger.py

@@ -36,6 +36,9 @@ class TriggerActivationException(Exception):
 class TriggerDeactivationException(Exception):
   pass
 
+class TriggerStartException(Exception):
+  pass
+
 class ValidationRequestException(Exception):
   pass
 
@@ -109,12 +112,19 @@ class BuildTrigger(object):
     """
     raise NotImplementedError
 
-  def manual_start(self, auth_token, config):
+  def manual_start(self, auth_token, config, run_parameters = None):
     """
     Manually creates a repository build for this trigger.
     """
     raise NotImplementedError
 
+  def list_field_values(self, auth_token, config, field_name):
+    """
+    Lists all values for the given custom trigger field. For example, a trigger might have a
+    field named "branches", and this method would return all branches.
+    """
+    raise NotImplementedError
+
   @classmethod
   def service_name(cls):
     """
@@ -345,14 +355,37 @@ class GithubBuildTrigger(BuildTrigger):
     return GithubBuildTrigger._prepare_build(config, repo, commit_sha,
                                              short_sha, ref)
 
-  def manual_start(self, auth_token, config):
-    source = config['build_source']
+  def manual_start(self, auth_token, config, run_parameters = None):
+    try:
+      source = config['build_source']
+      run_parameters = run_parameters or {}
 
-    gh_client = self._get_client(auth_token)
-    repo = gh_client.get_repo(source)
-    master = repo.get_branch(repo.default_branch)
-    master_sha = master.commit.sha
-    short_sha = GithubBuildTrigger.get_display_name(master_sha)
-    ref = 'refs/heads/%s' % repo.default_branch
+      gh_client = self._get_client(auth_token)
+      repo = gh_client.get_repo(source)
+      master = repo.get_branch(repo.default_branch)
+      master_sha = master.commit.sha
+      short_sha = GithubBuildTrigger.get_display_name(master_sha)
+      ref = 'refs/heads/%s' % (run_parameters.get('branch_name') or repo.default_branch)
 
-    return self._prepare_build(config, repo, master_sha, short_sha, ref)
+      return self._prepare_build(config, repo, master_sha, short_sha, ref)
+    except GithubException as ghe:
+      raise TriggerStartException(ghe.data['message'])
+
+
+  def list_field_values(self, auth_token, config, field_name):
+    if field_name == 'branch_name':
+      gh_client = self._get_client(auth_token)
+      source = config['build_source']
+      repo = gh_client.get_repo(source)
+      branches = [branch['name'] for branch in repo.get_branches()]
+
+      if not repo.default_branch in branches:
+        branches.insert(0, repo.default_branch)
+
+      if branches[0] != repo.default_branch:
+        branches.remove(repo.default_branch)
+        branches.insert(0, repo.default_branch)
+
+      return branches
+
+    return None