Merge branch 'bobthe'

Conflicts:
	test/data/test.db

endpoints/api.py

@@ -31,6 +31,7 @@ from datetime import datetime, timedelta
 
 store = app.config['STORAGE']
 user_files = app.config['USERFILES']
+build_logs = app.config['BUILDLOGS']
 logger = logging.getLogger(__name__)
 
 route_data = None
@@ -69,7 +70,7 @@ def get_route_data():
   routes = []
   for rule in app.url_map.iter_rules():
     if rule.endpoint.startswith('api.'):
-      endpoint_method = globals()[rule.endpoint[4:]] # Remove api.
+      endpoint_method = app.view_functions[rule.endpoint]
       is_internal = '__internal_call' in dir(endpoint_method)
       is_org_api = '__user_call' in dir(endpoint_method)
       methods = list(rule.methods.difference(['HEAD', 'OPTIONS']))
@@ -1148,40 +1149,69 @@ def get_repo(namespace, repository):
   abort(403)  # Permission denied
 
 
+def build_status_view(build_obj):
+  status = build_logs.get_status(build_obj.uuid)
+  return {
+    'id': build_obj.uuid,
+    'phase': build_obj.phase,
+    'started': build_obj.started,
+    'display_name': build_obj.display_name,
+    'status': status,
+  }
+
+
 @api.route('/repository/<path:repository>/build/', methods=['GET'])
 @parse_repository_name
 def get_repo_builds(namespace, repository):
   permission = ReadRepositoryPermission(namespace, repository)
   is_public = model.repository_is_public(namespace, repository)
   if permission.can() or is_public:
-    def build_view(build_obj):
-      # TODO(jake): Filter these logs if the current user can only *read* the repo.
-      if build_obj.status_url:
-        # Delegate the status to the build node
-        node_status = requests.get(build_obj.status_url).json()
-        node_status['id'] = build_obj.id
-        return node_status
-
-      # If there was no status url, do the best we can
-      # The format of this block should mirror that of the buildserver.
-      return {
-        'id': build_obj.id,
-        'total_commands': None,
-        'current_command': None,
-        'push_completion': 0.0,
-        'status': build_obj.phase,
-        'message': None,
-        'image_completion': {},
-      }
-
     builds = model.list_repository_builds(namespace, repository)
     return jsonify({
-      'builds': [build_view(build) for build in builds]
+      'builds': [build_status_view(build) for build in builds]
     })
 
   abort(403)  # Permission denied
 
 
+@api.route('/repository/<path:repository>/build/<build_uuid>/status',
+           methods=['GET'])
+@parse_repository_name
+def get_repo_build_status(namespace, repository, build_uuid):
+  permission = ReadRepositoryPermission(namespace, repository)
+  is_public = model.repository_is_public(namespace, repository)
+  if permission.can() or is_public:
+    build = model.get_repository_build(namespace, repository, build_uuid)
+    return jsonify(build_status_view(build))
+
+  abort(403)  # Permission denied
+
+
+@api.route('/repository/<path:repository>/build/<build_uuid>/logs',
+           methods=['GET'])
+@parse_repository_name
+def get_repo_build_logs(namespace, repository, build_uuid):
+  permission = ModifyRepositoryPermission(namespace, repository)
+  if permission.can():
+    response_obj = {}
+
+    build = model.get_repository_build(namespace, repository, build_uuid)
+
+    start = int(request.args.get('start', 0))
+
+    count, logs = build_logs.get_log_entries(build.uuid, start)
+
+    response_obj.update({
+      'start': start,
+      'total': count,
+      'logs': [log for log in logs],
+    })
+
+    return jsonify(response_obj)
+
+  abort(403)  # Permission denied
+
+
 @api.route('/repository/<path:repository>/build/', methods=['POST'])
 @api_login_required
 @parse_repository_name
@@ -1193,20 +1223,28 @@ def request_repo_build(namespace, repository):
 
     repo = model.get_repository(namespace, repository)
     token = model.create_access_token(repo, 'write')
+    display_name = user_files.get_file_checksum(dockerfile_id)
+    logger.debug('**********Md5: %s' % display_name)
 
     host = urlparse.urlparse(request.url).netloc
     tag = '%s/%s/%s' % (host, repo.namespace, repo.name)
     build_request = model.create_repository_build(repo, token, dockerfile_id,
-                                                  tag)
-    dockerfile_build_queue.put(json.dumps({'build_id': build_request.id}))
+                                                  tag, display_name)
+    dockerfile_build_queue.put(json.dumps({
+      'build_uuid': build_request.uuid,
+      'namespace': namespace,
+      'repository': repository,
+    }))
 
     log_action('build_dockerfile', namespace,
                {'repo': repository, 'namespace': namespace,
                 'fileid': dockerfile_id}, repo=repo)
 
-    resp = jsonify({
-      'started': True
-    })
+    resp = jsonify(build_status_view(build_request))
+    repo_string = '%s/%s' % (namespace, repository)
+    resp.headers['Location'] = url_for('api.get_repo_build_status',
+                                       repository=repo_string,
+                                       build_uuid=build_request.uuid)
     resp.status_code = 201
     return resp
 

endpoints/test.py

@@ -1,61 +0,0 @@
-import math
-
-from random import SystemRandom
-from flask import jsonify
-from app import app
-
-
-def generate_image_completion(rand_func):
-  images = {}
-  for image_id in range(rand_func.randint(1, 11)):
-    total = int(math.pow(abs(rand_func.gauss(0, 1000)), 2))
-    current = rand_func.randint(0, total)
-    image_id = 'image_id_%s' % image_id
-    images[image_id] = {
-      'total': total,
-      'current': current,
-    }
-  return images
-
-
-@app.route('/test/build/status', methods=['GET'])
-def generate_random_build_status():
-  response = {
-    'id': 1,
-    'total_commands': None,
-    'current_command': None,
-    'push_completion': 0.0,
-    'status': None,
-    'message': None,
-    'image_completion': {},
-  }
-
-  random = SystemRandom()
-  phases = {
-    'waiting': {},
-    'starting': {
-      'total_commands': 7,
-      'current_command': 0,
-    },
-    'initializing': {},
-    'error': {
-      'message': 'Oops!'
-    },
-    'complete': {},
-    'building': {
-      'total_commands': 7,
-      'current_command': random.randint(1, 7),    
-    },
-    'pushing': {
-      'total_commands': 7,
-      'current_command': 7,
-      'push_completion': random.random(),
-      'image_completion': generate_image_completion(random),
-    },
-  }
-
-  phase = random.choice(phases.keys())
-  response['status'] = phase
-  response.update(phases[phase])
-
-  return jsonify(response)