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

Conflicts:
	test/data/test.db

data/model/legacy.py

@@ -15,8 +15,9 @@ from data.database import (User, Repository, Image, AccessToken, Role, Repositor
                            ExternalNotificationEvent, ExternalNotificationMethod,
                            RepositoryNotification, RepositoryAuthorizedEmail, TeamMemberInvite,
                            DerivedImageStorage, ImageStorageTransformation, random_string_generator,
-                           db, BUILD_PHASE, QuayUserField, ImageStorageSignature,
-                           ImageStorageSignatureKind, validate_database_url, db_for_update)
+                           db, BUILD_PHASE, QuayUserField, ImageStorageSignature, QueueItem,
+                           ImageStorageSignatureKind, validate_database_url, db_for_update,
+                           AccessTokenKind)
 from peewee import JOIN_LEFT_OUTER, fn
 from util.validation import (validate_username, validate_email, validate_password,
                              INVALID_PASSWORD_MESSAGE)
@@ -1950,10 +1951,14 @@ def get_private_repo_count(username):
           .count())
 
 
-def create_access_token(repository, role):
+def create_access_token(repository, role, kind=None, friendly_name=None):
   role = Role.get(Role.name == role)
+  kind_ref = None
+  if kind is not None:
+    kind_ref = AccessTokenKind.get(AccessTokenKind.name == kind)
+
   new_token = AccessToken.create(repository=repository, temporary=True,
-                                 role=role)
+                                 role=role, kind=kind_ref, friendly_name=friendly_name)
   return new_token
 
 
@@ -2072,10 +2077,10 @@ def create_repository_build(repo, access_token, job_config_obj, dockerfile_id,
     pull_robot = lookup_robot(pull_robot_name)
 
   return RepositoryBuild.create(repository=repo, access_token=access_token,
-                                job_config=json.dumps(job_config_obj),
-                                display_name=display_name, trigger=trigger,
-                                resource_key=dockerfile_id,
-                                pull_robot=pull_robot)
+                                 job_config=json.dumps(job_config_obj),
+                                 display_name=display_name, trigger=trigger,
+                                 resource_key=dockerfile_id,
+                                 pull_robot=pull_robot)
 
 
 def get_pull_robot_name(trigger):
@@ -2479,6 +2484,32 @@ def confirm_team_invite(code, user):
   found.delete_instance()
   return (team, inviter)
 
+def cancel_repository_build(build):
+  with config.app_config['DB_TRANSACTION_FACTORY'](db):
+    # Reload the build for update.
+    try:
+      build = db_for_update(RepositoryBuild.select().where(RepositoryBuild.id == build.id)).get()
+    except RepositoryBuild.DoesNotExist:
+      return False
+
+    if build.phase != BUILD_PHASE.WAITING or not build.queue_item:
+      return False
+
+    # Load the build queue item for update.
+    try:
+      queue_item = db_for_update(QueueItem.select()
+                                          .where(QueueItem.id == build.queue_item.id)).get()
+    except QueueItem.DoesNotExist:
+      return False
+
+    # Check the queue item.
+    if not queue_item.available or queue_item.retries_remaining == 0:
+      return False
+
+    # Delete the queue item and build.
+    queue_item.delete_instance(recursive=True)
+    build.delete_instance()
+    return True
 
 def get_repository_usage():
   one_month_ago = date.today() - timedelta(weeks=4)