Change revert tag into restore tag and add manifest support

data/model/tag.py

@@ -324,32 +324,69 @@ def list_repository_tag_history(repo_obj, page=1, size=100, specific_tag=None):
   return tags[0:size], manifest_map, len(tags) > size
 
 
-def revert_tag(repo_obj, tag_name, docker_image_id):
-  """ Reverts a tag to a specific image ID. """
-  # Verify that the image ID already existed under this repository under the
-  # tag.
-  try:
-    (RepositoryTag
-     .select()
-     .join(Image)
-     .where(RepositoryTag.repository == repo_obj)
-     .where(RepositoryTag.name == tag_name)
-     .where(Image.docker_image_id == docker_image_id)
-     .get())
-  except RepositoryTag.DoesNotExist:
-    raise DataModelException('Cannot revert to unknown or invalid image')
+def restore_tag_to_manifest(repo_obj, tag_name, manifest_digest):
+  """ Restores a tag to a specific manifest digest. """
+  with db_transaction():
+    # Verify that the manifest digest already existed under this repository under the
+    # tag.
+    try:
+      manifest = (TagManifest
+                  .select(TagManifest, RepositoryTag, Image)
+                  .join(RepositoryTag)
+                  .join(Image)
+                  .where(RepositoryTag.repository == repo_obj)
+                  .where(RepositoryTag.name == tag_name)
+                  .where(TagManifest.digest == manifest_digest)
+                  .get())
+    except TagManifest.DoesNotExist:
+      raise DataModelException('Cannot restore to unknown or invalid digest')
 
-  return create_or_update_tag(repo_obj.namespace_user.username, repo_obj.name, tag_name,
-                              docker_image_id, reversion=True)
+    # Lookup the existing image, if any.
+    try:
+      existing_image = get_repo_tag_image(repo_obj, tag_name)
+    except DataModelException:
+      existing_image = None
+
+    docker_image_id = manifest.tag.image.docker_image_id
+    store_tag_manifest(repo_obj.namespace_user.username, repo_obj.name, tag_name, docker_image_id,
+                       manifest_digest, manifest.json_data, reversion=True)
+    return existing_image
+
+
+def restore_tag_to_image(repo_obj, tag_name, docker_image_id):
+  """ Restores a tag to a specific image ID. """
+  with db_transaction():
+    # Verify that the image ID already existed under this repository under the
+    # tag.
+    try:
+      (RepositoryTag
+       .select()
+       .join(Image)
+       .where(RepositoryTag.repository == repo_obj)
+       .where(RepositoryTag.name == tag_name)
+       .where(Image.docker_image_id == docker_image_id)
+       .get())
+    except RepositoryTag.DoesNotExist:
+      raise DataModelException('Cannot restore to unknown or invalid image')
+
+    # Lookup the existing image, if any.
+    try:
+      existing_image = get_repo_tag_image(repo_obj, tag_name)
+    except DataModelException:
+      existing_image = None
+
+    create_or_update_tag(repo_obj.namespace_user.username, repo_obj.name, tag_name,
+                         docker_image_id, reversion=True)
+    return existing_image
 
 
 def store_tag_manifest(namespace, repo_name, tag_name, docker_image_id, manifest_digest,
-                       manifest_data):
+                       manifest_data, reversion=False):
   """ Stores a tag manifest for a specific tag name in the database. Returns the TagManifest
       object, as well as a boolean indicating whether the TagManifest was created.
   """
   with db_transaction():
-    tag = create_or_update_tag(namespace, repo_name, tag_name, docker_image_id)
+    tag = create_or_update_tag(namespace, repo_name, tag_name, docker_image_id, reversion=reversion)
 
     try:
       manifest = TagManifest.get(digest=manifest_digest)