Merge branch 'master' into git

endpoints/api/build.py

@@ -148,12 +148,17 @@ class RepositoryBuildList(RepositoryParamResource):
   @require_repo_read
   @parse_args
   @query_param('limit', 'The maximum number of builds to return', type=int, default=5)
+  @query_param('since', 'Returns all builds since the given unix timecode', type=int, default=None)
   @nickname('getRepoBuilds')
   def get(self, args, namespace, repository):
     """ Get the list of repository builds. """
-    limit = args['limit']
-    builds = list(model.list_repository_builds(namespace, repository, limit))
+    limit = args.get('limit', 5)
+    since = args.get('since', None)
 
+    if since is not None:
+      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]

endpoints/api/image.py

@@ -17,7 +17,7 @@ def image_view(image, image_map):
   command = extended_props.command
 
   def docker_id(aid):
-    if not aid:
+    if not aid or not aid in image_map:
       return ''
 
     return image_map[aid]
@@ -51,19 +51,26 @@ class RepositoryImageList(RepositoryParamResource):
     all_tags = model.list_repository_tags(namespace, repository)
 
     tags_by_image_id = defaultdict(list)
+    found_image_ids = set()
+
     for tag in all_tags:
       tags_by_image_id[tag.image.docker_image_id].append(tag.name)
+      found_image_ids.add(str(tag.image.id))
+      found_image_ids.update(tag.image.ancestors.split('/')[1:-1])
 
     image_map = {}
+    filtered_images = []
     for image in all_images:
-      image_map[str(image.id)] = image.docker_image_id
+      if str(image.id) in found_image_ids:
+        image_map[str(image.id)] = image.docker_image_id
+        filtered_images.append(image)
 
     def add_tags(image_json):
       image_json['tags'] = tags_by_image_id[image_json['id']]
       return image_json
 
     return {
-      'images': [add_tags(image_view(image, image_map)) for image in all_images]
+      'images': [add_tags(image_view(image, image_map)) for image in filtered_images]
     }
 
 

endpoints/api/repository.py

@@ -1,5 +1,7 @@
 import logging
 import json
+import datetime
+from datetime import timedelta
 
 from flask import request
 
@@ -175,27 +177,30 @@ class Repository(RepositoryParamResource):
     logger.debug('Get repo: %s/%s' % (namespace, repository))
 
     def tag_view(tag):
-      return {
+      tag_info = {
         'name': tag.name,
-        'image_id': tag.image.docker_image_id
+        'image_id': tag.image.docker_image_id,
+        'size': tag.image.storage.aggregate_size
       }
 
-    organization = None
-    try:
-      organization = model.get_organization(namespace)
-    except model.InvalidOrganizationException:
-      pass
+      if tag.lifetime_start_ts > 0:
+        tag_info['last_modified'] = format_date(datetime.datetime.fromtimestamp(tag.lifetime_start_ts))
+
+      return tag_info
 
-    is_public = model.repository_is_public(namespace, repository)
     repo = model.get_repository(namespace, repository)
     if repo:
-      tags = model.list_repository_tags(namespace, repository)
+      tags = model.list_repository_tags(namespace, repository, include_storage=True)
       tag_dict = {tag.name: tag_view(tag) for tag in tags}
       can_write = ModifyRepositoryPermission(namespace, repository).can()
       can_admin = AdministerRepositoryPermission(namespace, repository).can()
       active_builds = model.list_repository_builds(namespace, repository, 1,
                                                    include_inactive=False)
 
+      is_starred = (model.repository_is_starred(get_authenticated_user(), repo)
+                    if get_authenticated_user() else False)
+      is_public = model.is_repository_public(repo)
+
       return {
         'namespace': namespace,
         'name': repository,
@@ -205,8 +210,19 @@ class Repository(RepositoryParamResource):
         'can_admin': can_admin,
         'is_public': is_public,
         'is_building': len(list(active_builds)) > 0,
-        'is_organization': bool(organization),
-        'status_token': repo.badge_token if not is_public else ''
+        'is_organization': repo.namespace_user.organization,
+        'is_starred': is_starred,
+        'status_token': repo.badge_token if not is_public else '',
+        'stats': {
+          'pulls': {
+            'today': model.get_repository_pulls(repo, timedelta(days=1)),
+            'thirty_day': model.get_repository_pulls(repo, timedelta(days=30))
+          },
+          'pushes': {
+            'today': model.get_repository_pushes(repo, timedelta(days=1)),
+            'thirty_day': model.get_repository_pushes(repo, timedelta(days=30))
+          }
+        }
       }
 
     raise NotFound()

endpoints/callbacks.py

@@ -247,6 +247,7 @@ def github_oauth_attach():
 
 
 @callback.route('/github/callback/trigger/<path:repository>', methods=['GET'])
+@callback.route('/github/callback/trigger/<path:repository>/__new', methods=['GET'])
 @route_show_if(features.GITHUB_BUILD)
 @require_session_login
 @parse_repository_name
@@ -260,9 +261,18 @@ def attach_github_build_trigger(namespace, repository):
       abort(404, message=msg)
 
     trigger = model.create_build_trigger(repo, 'github', token, current_user.db_user())
+
+    # TODO(jschorr): Remove once the new layout is in place.
     admin_path = '%s/%s/%s' % (namespace, repository, 'admin')
     full_url = '%s%s%s' % (url_for('web.repository', path=admin_path), '?tab=trigger&new_trigger=',
                            trigger.uuid)
+
+    if '__new' in request.url:
+      repo_path = '%s/%s' % (namespace, repository)
+      full_url = '%s%s%s' % (url_for('web.repository', path=repo_path), '?tab=builds&newtrigger=',
+                             trigger.uuid)
+
+
     logger.debug('Redirecting to full url: %s' % full_url)
     return redirect(full_url)
 

endpoints/common.py

@@ -19,6 +19,7 @@ from app import app, oauth_apps, dockerfile_build_queue, LoginWrappedDBUser
 
 from auth.permissions import QuayDeferredPermissionUser
 from auth import scopes
+from auth.auth_context import get_authenticated_user
 from endpoints.api.discovery import swagger_route_data
 from werkzeug.routing import BaseConverter
 from functools import wraps
@@ -225,7 +226,8 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
     'registry': host,
     'build_subdir': subdir,
     'trigger_metadata': trigger_metadata or {},
-    'is_manual': manual
+    'is_manual': manual,
+    'manual_user': get_authenticated_user().username if get_authenticated_user() else None
   }
 
   with app.config['DB_TRANSACTION_FACTORY'](db):
@@ -250,7 +252,8 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
     'repo': repository.name,
     'namespace': repository.namespace_user.username,
     'fileid': dockerfile_id,
-    'manual': manual,
+    'is_manual': manual,
+    'manual_user': get_authenticated_user().username if get_authenticated_user() else None
   }
 
   if trigger:
@@ -267,7 +270,8 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
     'build_id': build_request.uuid,
     'build_name': build_name,
     'docker_tags': tags,
-    'is_manual': manual
+    'is_manual': manual,
+    'manual_user': get_authenticated_user().username if get_authenticated_user() else None
   }
 
   if trigger:

endpoints/trigger.py

@@ -323,21 +323,27 @@ class GithubBuildTrigger(BuildTrigger):
       logger.exception('Could not load data for commit')
       return
 
-    return {
+    commit_info = {
       'url': commit.html_url,
       'message': commit.commit.message,
-      'author': {
+      'date': commit.last_modified
+    }
+
+    if commit.author:
+      commit_info['author'] = {
         'username': commit.author.login,
         'avatar_url': commit.author.avatar_url,
         'url': commit.author.html_url
-      },
-      'committer': {
+      }
+
+    if commit.committer:
+      commit_info['committer'] = {
         'username': commit.committer.login,
         'avatar_url': commit.committer.avatar_url,
         'url': commit.committer.html_url
-      },
-      'date': commit.last_modified
-    }
+      }
+
+    return commit_info
 
   @staticmethod
   def _prepare_build(config, repo, commit_sha, build_name, ref):