Add UI for viewing and changing the expiration of tags

endpoints/api/tag.py

@@ -1,5 +1,6 @@
 """ Manage the tags of a repository. """
 
+from datetime import datetime, timedelta
 from flask import request, abort
 
 from auth.auth_context import get_authenticated_user
@@ -54,12 +55,15 @@ class RepositoryTag(RepositoryParamResource):
   schemas = {
     'MoveTag': {
       'type': 'object',
-      'description': 'Description of to which image a new or existing tag should point',
-      'required': ['image',],
+      'description': 'Makes changes to a specific tag',
       'properties': {
         'image': {
-          'type': 'string',
-          'description': 'Image identifier to which the tag should point',
+          'type': ['string', 'null'],
+          'description': '(If specified) Image identifier to which the tag should point',
+        },
+        'image': {
+          'type': ['number', 'null'],
+          'description': '(If specified) The expiration for the image',
         },
       },
     },
@@ -75,25 +79,52 @@ class RepositoryTag(RepositoryParamResource):
     if not TAG_REGEX.match(tag):
       abort(400, TAG_ERROR)
 
-    image_id = request.get_json()['image']
-    repo = model.get_repo(namespace, repository, image_id)
+    repo = model.get_repo(namespace, repository)
     if not repo:
       raise NotFound()
 
-    original_image_id = model.get_repo_tag_image(repo, tag)
-    model.create_or_update_tag(namespace, repository, tag, image_id)
+    if 'expiration' in request.get_json():
+      expiration = request.get_json().get('expiration')
+      expiration_date = None
+      if expiration is not None:
+       try:
+         expiration_date = datetime.utcfromtimestamp(float(expiration))
+       except ValueError:
+         abort(400)
 
-    username = get_authenticated_user().username
-    log_action('move_tag' if original_image_id else 'create_tag', namespace, {
-      'username': username,
-      'repo': repository,
-      'tag': tag,
-      'namespace': namespace,
-      'image': image_id,
-      'original_image': original_image_id
-    }, repo_name=repository)
+       if expiration_date <= datetime.now():
+         abort(400)
 
-    _generate_and_store_manifest(namespace, repository, tag)
+      existing_end_ts, ok = model.change_repository_tag_expiration(namespace, repository, tag,
+                                                                   expiration_date)
+      if ok:
+       if not (existing_end_ts is None and expiration_date is None):
+         log_action('change_tag_expiration', namespace, {
+           'username': get_authenticated_user().username,
+           'repo': repository,
+           'tag': tag,
+           'namespace': namespace,
+           'expiration_date': expiration_date,
+           'old_expiration_date': existing_end_ts
+         }, repo=repo)
+      else:
+       abort(400, 'Could not update tag expiration; Tag has probably changed')
+
+    if 'image' in request.get_json():
+      image_id = request.get_json()['image']
+      original_image_id = model.get_repo_tag_image(repo, tag)
+      model.create_or_update_tag(namespace, repository, tag, image_id)
+
+      username = get_authenticated_user().username
+      log_action('move_tag' if original_image_id else 'create_tag', namespace, {
+        'username': username,
+        'repo': repository,
+        'tag': tag,
+        'namespace': namespace,
+        'image': image_id,
+        'original_image': original_image_id
+      }, repo_name=repository)
+      _generate_and_store_manifest(namespace, repository, tag)
 
     return 'Updated', 201