Merge branch 'tagyourit'

endpoints/api/tag.py

@@ -1,5 +1,7 @@
-from endpoints.api import (resource, nickname, require_repo_read, require_repo_admin,
-                           RepositoryParamResource, log_action, NotFound)
+from flask import request
+
+from endpoints.api import (resource, nickname, require_repo_read, require_repo_write,
+                           RepositoryParamResource, log_action, NotFound, validate_json_request)
 from endpoints.api.image import image_view
 from data import model
 from auth.auth_context import get_authenticated_user
@@ -8,8 +10,54 @@ from auth.auth_context import get_authenticated_user
 @resource('/v1/repository/<repopath:repository>/tag/<tag>')
 class RepositoryTag(RepositoryParamResource):
   """ Resource for managing repository tags. """
+  schemas = {
+    'MoveTag': {
+      'id': 'MoveTag',
+      'type': 'object',
+      'description': 'Description of to which image a new or existing tag should point',
+      'required': [
+        'image',
+      ],
+      'properties': {
+        'image': {
+          'type': 'string',
+          'description': 'Image identifier to which the tag should point',
+        },
+      },
+    },
+  }
 
-  @require_repo_admin
+  @require_repo_write
+  @nickname('changeTagImage')
+  @validate_json_request('MoveTag')
+  def put(self, namespace, repository, tag):
+    """ Change which image a tag points to or create a new tag."""
+    image_id = request.get_json()['image']
+    image = model.get_repo_image(namespace, repository, image_id)
+    if not image:
+      raise NotFound()
+    
+    original_image_id = None
+    try:
+      original_tag_image = model.get_tag_image(namespace, repository, tag)
+      if original_tag_image:
+        original_image_id = original_tag_image.docker_image_id
+    except model.DataModelException:
+      # This is a new tag.
+      pass
+
+    model.create_or_update_tag(namespace, repository, tag, image_id)
+    model.garbage_collect_repository(namespace, repository)
+
+    username = get_authenticated_user().username
+    log_action('move_tag' if original_image_id else 'create_tag', namespace,
+               { 'username': username, 'repo': repository, 'tag': tag,
+                 'image': image_id, 'original_image': original_image_id },
+               repo=model.get_repository(namespace, repository))
+
+    return 'Updated', 201
+
+  @require_repo_write
   @nickname('deleteFullTag')
   def delete(self, namespace, repository, tag):
     """ Delete the specified repository tag. """