UI fixes for all the new trigger stuff

endpoints/api/build.py

@@ -14,7 +14,9 @@ from endpoints.building import start_build, PreparedBuild
 from endpoints.trigger import BuildTriggerHandler
 from data import model, database
 from auth.auth_context import get_authenticated_user
-from auth.permissions import ModifyRepositoryPermission, AdministerOrganizationPermission
+from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission,
+                              AdministerRepositoryPermission, AdministerOrganizationPermission)
+
 from data.buildlogs import BuildStatusRetrievalError
 from util.names import parse_robot_username
 
@@ -33,7 +35,7 @@ def get_job_config(build_obj):
   try:
     return json.loads(build_obj.job_config)
   except:
-    return None
+    return {}
 
 
 def user_view(user):
@@ -43,11 +45,12 @@ def user_view(user):
     'is_robot': user.robot,
   }
 
-def trigger_view(trigger, can_admin=False):
+def trigger_view(trigger, can_read=False, can_admin=False):
   if trigger and trigger.uuid:
     build_trigger = BuildTriggerHandler.get_handler(trigger)
     return {
       'service': trigger.service.name,
+      'build_source': build_trigger.config.get('build_source') if can_read else None,
       'config': build_trigger.config if can_admin else {},
       'id': trigger.uuid,
       'connected_user': trigger.connected_user.username,
@@ -58,7 +61,7 @@ def trigger_view(trigger, can_admin=False):
   return None
 
 
-def build_status_view(build_obj, can_write=False, can_admin=False):
+def build_status_view(build_obj):
   phase = build_obj.phase
   try:
     status = build_logs.get_status(build_obj.uuid)
@@ -81,21 +84,32 @@ def build_status_view(build_obj, can_write=False, can_admin=False):
     if not retry:
       phase = database.BUILD_PHASE.ERROR
 
-  logger.debug('Can write: %s job_config: %s', can_write, build_obj.job_config)
+  repo_namespace = build_obj.repository.namespace_user.username
+  repo_name = build_obj.repository.name
+
+  can_read = ReadRepositoryPermission(repo_namespace, repo_name).can()
+  can_write = ModifyRepositoryPermission(repo_namespace, repo_name).can()
+  can_admin = AdministerRepositoryPermission(repo_namespace, repo_name).can()
+
+  job_config = get_job_config(build_obj)
+
   resp = {
     'id': build_obj.uuid,
     'phase': phase,
     'started': format_date(build_obj.started),
     'display_name': build_obj.display_name,
     'status': status or {},
-    'job_config': get_job_config(build_obj) if can_write else None,
+    'subdirectory': job_config.get('build_subdir', ''),
+    'tags': job_config.get('docker_tags', []),
+    'manual_user': job_config.get('manual_user',  None),
     'is_writer': can_write,
-    'trigger': trigger_view(build_obj.trigger, can_admin),
+    'trigger': trigger_view(build_obj.trigger, can_read, can_admin),
+    'trigger_metadata': job_config.get('trigger_metadata', None) if can_read else None,
     'resource_key': build_obj.resource_key,
     'pull_robot': user_view(build_obj.pull_robot) if build_obj.pull_robot else None,
     'repository': {
-      'namespace': build_obj.repository.namespace_user.username,
-      'name': build_obj.repository.name
+      'namespace': repo_namespace,
+      'name': repo_name
     }
   }
 
@@ -157,9 +171,8 @@ class RepositoryBuildList(RepositoryParamResource):
       since = datetime.datetime.utcfromtimestamp(since)
 
     builds = model.list_repository_builds(namespace, repository, limit, since=since)
-    can_write = ModifyRepositoryPermission(namespace, repository).can()
     return {
-      'builds': [build_status_view(build, can_write) for build in builds]
+      'builds': [build_status_view(build) for build in builds]
     }
 
   @require_repo_write
@@ -211,7 +224,7 @@ class RepositoryBuildList(RepositoryParamResource):
     prepared.metadata = {}
 
     build_request = start_build(repo, prepared, pull_robot_name=pull_robot_name)
-    resp = build_status_view(build_request, can_write=True)
+    resp = build_status_view(build_request)
     repo_string = '%s/%s' % (namespace, repository)
     headers = {
       'Location': api.url_for(RepositoryBuildStatus, repository=repo_string,
@@ -236,8 +249,7 @@ class RepositoryBuildResource(RepositoryParamResource):
     except model.InvalidRepositoryBuildException:
       raise NotFound()
 
-    can_write = ModifyRepositoryPermission(namespace, repository).can()
-    return build_status_view(build, can_write)
+    return build_status_view(build)
 
   @require_repo_admin
   @nickname('cancelRepoBuild')
@@ -271,8 +283,7 @@ class RepositoryBuildStatus(RepositoryParamResource):
         build.repository.namespace_user.username != namespace):
       raise NotFound()
 
-    can_write = ModifyRepositoryPermission(namespace, repository).can()
-    return build_status_view(build, can_write)
+    return build_status_view(build)
 
 
 @resource('/v1/repository/<repopath:repository>/build/<build_uuid>/logs')