Merge remote-tracking branch 'origin/master' into ldapper

Conflicts:
	app.py

app.py

@@ -16,6 +16,7 @@ from data.users import UserAuthentication
 from util.analytics import Analytics
 from util.exceptionlog import Sentry
 from data.billing import Billing
+from data.buildlogs import BuildLogs
 
 
 OVERRIDE_CONFIG_FILENAME = 'conf/stack/config.py'
@@ -49,6 +50,7 @@ userfiles = Userfiles(app)
 analytics = Analytics(app)
 billing = Billing(app)
 sentry = Sentry(app)
+build_logs = BuildLogs(app)
 authentication = UserAuthentication(app)
 
 database.configure(app.config)

config.py

@@ -80,7 +80,7 @@ class DefaultConfig(object):
   AUTHENTICATION_TYPE = 'Database'
 
   # Build logs
-  BUILDLOGS = BuildLogs('logs.quay.io') # Change me
+  BUILDLOGS_OPTIONS = ['logs.quay.io']
 
   # Real-time user events
   USER_EVENTS = UserEventBuilder('logs.quay.io')

data/buildlogs.py

@@ -1,10 +1,12 @@
 import redis
 import json
 
+from util.dynamic import import_class
+
 class BuildStatusRetrievalError(Exception):
   pass
 
-class BuildLogs(object):
+class RedisBuildLogs(object):
   ERROR = 'error'
   COMMAND = 'command'
   PHASE = 'phase'
@@ -70,3 +72,30 @@ class BuildLogs(object):
       raise BuildStatusRetrievalError('Cannot retrieve build status')
 
     return json.loads(fetched) if fetched else None
+
+class BuildLogs(object):
+  def __init__(self, app=None):
+    self.app = app
+    if app is not None:
+      self.state = self.init_app(app)
+    else:
+      self.state = None
+
+  def init_app(self, app):
+    buildlogs_options = app.config.get('BUILDLOGS_OPTIONS', [])
+    buildlogs_import = app.config.get('BUILDLOGS_MODULE_AND_CLASS', None)
+
+    if buildlogs_import is None:
+      klass = RedisBuildLogs
+    else:
+      klass = import_class(buildlogs_import[0], buildlogs_import[1])
+
+    buildlogs = klass(*buildlogs_options)
+
+    # register extension with app
+    app.extensions = getattr(app, 'extensions', {})
+    app.extensions['buildlogs'] = buildlogs
+    return buildlogs
+
+  def __getattr__(self, name):
+    return getattr(self.state, name, None)

endpoints/api/build.py

@@ -3,7 +3,7 @@ import json
 
 from flask import request
 
-from app import app, userfiles as user_files
+from app import app, userfiles as user_files, build_logs
 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)
@@ -17,7 +17,6 @@ from util.names import parse_robot_username
 
 
 logger = logging.getLogger(__name__)
-build_logs = app.config['BUILDLOGS']
 
 
 def get_trigger_config(trigger):

static/js/app.js

@@ -84,7 +84,7 @@ function createOrganizationTeam(ApiService, orgname, teamname, callback) {
     'teamname': teamname
   };
   
-  ApiService.updateOrganizationTeam(data, params).then(callback, function() {
+  ApiService.updateOrganizationTeam(data, params).then(callback, function(resp) {
     bootbox.dialog({
       "message": resp.data ? resp.data : 'The team could not be created',
       "title": "Cannot create team",

static/js/controllers.js

@@ -4,11 +4,16 @@ $.fn.clipboardCopy = function() {
   clip.on('complete', function() {
     // Resets the animation.
     var elem = $('#clipboardCopied')[0];
+    if (!elem) {
+      return;
+    }
+
     elem.style.display = 'none';
     elem.classList.remove('animated');
 
     // Show the notification.
     setTimeout(function() {
+      if (!elem) { return; }
       elem.style.display = 'inline-block';
       elem.classList.add('animated');
     }, 10);
@@ -1016,7 +1021,6 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
     $scope.currentParentEntry = null;
 
     $scope.currentBuild = build;
-    $scope.currentBuildIndex = index;
 
     if (opt_updateURL) {
       if (build) {
@@ -1094,8 +1098,18 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
     ApiService.getRepoBuildStatus(null, params, true).then(function(resp) {
       // Note: We use extend here rather than replacing as Angular is depending on the
       // root build object to remain the same object.
-      $.extend(true, $scope.builds[$scope.currentBuildIndex], resp);
+      var matchingBuilds = $.grep($scope.builds, function(elem) {
-      var currentBuild = $scope.builds[$scope.currentBuildIndex];
+        return elem['id'] == resp['id']
+      });
+
+      var currentBuild = matchingBuilds.length > 0 ? matchingBuilds[0] : null;
+      if (currentBuild) {
+        currentBuild = $.extend(true, currentBuild, resp);
+      } else {
+        currentBuild = resp;
+        $scope.builds.push(currentBuild);
+      }
+
       checkPollTimer();
 
       // Load the updated logs for the build.
@@ -1184,12 +1198,12 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
   $scope.getBadgeFormat = function(format, repo) {
     if (!repo) { return; }
 
-    var imageUrl = Config.getUrl('/' + namespace + '/' + name + '/status');
+    var imageUrl = Config.getUrl('/repository/' + namespace + '/' + name + '/status');
     if (!$scope.repo.is_public) {
       imageUrl += '?token=' + $scope.repo.status_token;
     }
 
-    var linkUrl = Config.getUrl('/' + namespace + '/' + name);
+    var linkUrl = Config.getUrl('/repository/' + namespace + '/' + name);
 
     switch (format) {
       case 'svg':
@@ -1587,6 +1601,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
 
     $scope.cuser = jQuery.extend({}, user);
 
+    if ($scope.cuser.logins) {
       for (var i = 0; i < $scope.cuser.logins.length; i++) {
         if ($scope.cuser.logins[i].service == 'github') {
           var githubId = $scope.cuser.logins[i].service_identifier;
@@ -1595,6 +1610,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
           });
         }
       }
+    }
   });
 
   $scope.readyForPlan = function() {

test/testconfig.py

@@ -24,8 +24,9 @@ class TestConfig(DefaultConfig):
 
   STORAGE_TYPE = 'FakeStorage'
 
-  BUILDLOGS = TestBuildLogs('logs.quay.io', 'devtable', 'building',
+  BUILDLOGS_MODULE_AND_CLASS = ('test.testlogs', 'testlogs.TestBuildLogs')
-                            'deadbeef-dead-beef-dead-beefdeadbeef')
+  BUILDLOGS_OPTIONS = ['logs.quay.io', 'devtable', 'building',
+                       'deadbeef-dead-beef-dead-beefdeadbeef']
 
   USERFILES_TYPE = 'FakeUserfiles'
 

test/testlogs.py

@@ -5,7 +5,7 @@ from loremipsum import get_sentence
 from functools import wraps
 from copy import deepcopy
 
-from data.buildlogs import BuildLogs
+from data.buildlogs import RedisBuildLogs
 
 
 logger = logging.getLogger(__name__)
@@ -32,7 +32,7 @@ def maybe_advance_script(is_get_status=False):
   return inner_advance
 
 
-class TestBuildLogs(BuildLogs):
+class TestBuildLogs(RedisBuildLogs):
   COMMAND_TYPES = ['FROM', 'MAINTAINER', 'RUN', 'CMD', 'EXPOSE', 'ENV', 'ADD', 
                    'ENTRYPOINT', 'VOLUME', 'USER', 'WORKDIR']
   STATUS_TEMPLATE = {

util/dynamic.py

@@ -0,0 +1,7 @@
+def import_class(module_name, class_name):
+  """ Import a class given the specified module name and class name. """
+  klass = __import__(module_name)
+  class_segments = class_name.split('.')
+  for segment in class_segments:
+    klass = getattr(klass, segment)
+  return klass

workers/dockerfilebuild.py

@@ -21,7 +21,7 @@ from collections import defaultdict
 from data.queue import dockerfile_build_queue
 from data import model
 from workers.worker import Worker, WorkerUnhealthyException, JobException
-from app import app, userfiles as user_files
+from app import app, userfiles as user_files, build_logs
 from util.safetar import safe_extractall
 from util.dockerfileparse import parse_dockerfile, ParsedDockerfile, serialize_dockerfile
 
@@ -34,8 +34,6 @@ formatter = logging.Formatter(FORMAT)
 
 logger = logging.getLogger(__name__)
 
-build_logs = app.config['BUILDLOGS']
-
 TIMEOUT_PERIOD_MINUTES = 20
 CACHE_EXPIRATION_PERIOD_HOURS = 24
 NO_TAGS = ['<none>:<none>']