Merge branch 'master' into redalert

endpoints/api/repository.py

@@ -138,21 +138,6 @@ class RepositoryList(ApiResource):
 
     return response
 
-def image_view(image):
-  extended_props = image
-  if image.storage and image.storage.id:
-    extended_props = image.storage
-
-  command = extended_props.command
-  return {
-    'id': image.docker_image_id,
-    'created': format_date(extended_props.created),
-    'comment': extended_props.comment,
-    'command': json.loads(command) if command else None,
-    'ancestors': image.ancestors,
-    'dbid': image.id,
-    'size': extended_props.image_size
-  }
 
 @resource('/v1/repository/<repopath:repository>')
 class Repository(RepositoryParamResource):
@@ -181,13 +166,10 @@ class Repository(RepositoryParamResource):
     logger.debug('Get repo: %s/%s' % (namespace, repository))
 
     def tag_view(tag):
-      image = model.get_tag_image(namespace, repository, tag.name)
-      if not image:
-        return {}
-
       return {
         'name': tag.name,
-        'image': image_view(image),
+        'image_id': tag.image.docker_image_id,
+        'dbid': tag.image.id
       }
 
     organization = None

endpoints/api/repotoken.py

@@ -60,7 +60,7 @@ class RepositoryTokenList(RepositoryParamResource):
 
     log_action('add_repo_accesstoken', namespace,
                {'repo': repository, 'token': token_params['friendlyName']},
-               repo = model.get_repository(namespace, repository))
+               repo=model.get_repository(namespace, repository))
 
     return token_view(token), 201
 
@@ -116,7 +116,7 @@ class RepositoryToken(RepositoryParamResource):
     log_action('change_repo_permission', namespace,
                {'repo': repository, 'token': token.friendly_name, 'code': code,
                 'role': new_permission['role']},
-               repo = model.get_repository(namespace, repository))
+               repo=model.get_repository(namespace, repository))
 
     return token_view(token)
 
@@ -129,6 +129,6 @@ class RepositoryToken(RepositoryParamResource):
     log_action('delete_repo_accesstoken', namespace,
                {'repo': repository, 'token': token.friendly_name,
                 'code': code},
-               repo = model.get_repository(namespace, repository))
+               repo=model.get_repository(namespace, repository))
 
     return 'Deleted', 204

endpoints/api/trigger.py

@@ -81,6 +81,9 @@ class BuildTrigger(RepositoryParamResource):
                   'service': trigger.service.name, 'config': config_dict},
                  repo=model.get_repository(namespace, repository))
 
+    if trigger.write_token is not None:
+      trigger.write_token.delete_instance()
+
     trigger.delete_instance(recursive=True)
     return 'No Content', 204