Merge pull request #1102 from coreos-inc/deleteimagediff

Delete the image diff feature

endpoints/api/image.py

@@ -1,10 +1,8 @@
-""" List and lookup repository images, and download image diffs. """
+""" List and lookup repository images. """
 
 import json
 
 from collections import defaultdict
-
-from app import storage as store
 from endpoints.api import (resource, nickname, require_repo_read, RepositoryParamResource,
                            format_date, NotFound, path_param)
 from data import model
@@ -104,27 +102,3 @@ class RepositoryImage(RepositoryParamResource):
 
     return historical_image_view(image, image_map)
 
-
-@resource('/v1/repository/<repopath:repository>/image/<image_id>/changes')
-@path_param('repository', 'The full path of the repository. e.g. namespace/name')
-@path_param('image_id', 'The Docker image ID')
-class RepositoryImageChanges(RepositoryParamResource):
-  """ Resource for handling repository image change lists. """
-
-  @cache_control_flask_restful(max_age=60*60)  # Cache for one hour
-  @require_repo_read
-  @nickname('getImageChanges')
-  def get(self, namespace, repository, image_id):
-    """ Get the list of changes for the specified image. """
-    image = model.image.get_repo_image_extended(namespace, repository, image_id)
-
-    if not image:
-      raise NotFound()
-
-    diffs_path = store.image_file_diffs_path(image.storage.uuid)
-
-    try:
-      response_json = json.loads(store.get_content(image.storage.locations, diffs_path))
-      return response_json
-    except IOError:
-      raise NotFound()

endpoints/v1/registry.py

@@ -12,7 +12,6 @@ from auth.auth import process_auth, extract_namespace_repo_from_session
 from auth.auth_context import get_authenticated_user
 from auth.registry_jwt_auth import get_granted_username
 from digest import checksums
-from util.registry import changes
 from util.http import abort, exact_abort
 from util.registry.filelike import SocketReader
 from auth.permissions import (ReadRepositoryPermission,
@@ -482,58 +481,3 @@ def put_image_json(namespace, repository, image_id):
 
   return make_response('true', 200)
 
-
-def process_image_changes(namespace, repository, image_id):
-  logger.debug('Generating diffs for image: %s', image_id)
-
-  repo_image = model.image.get_repo_image_extended(namespace, repository, image_id)
-  if not repo_image:
-    logger.warning('No image for id: %s', image_id)
-    return None, None
-
-  uuid = repo_image.storage.uuid
-
-  image_diffs_path = store.image_file_diffs_path(uuid)
-  image_trie_path = store.image_file_trie_path(uuid)
-
-  if store.exists(repo_image.storage.locations, image_diffs_path):
-    logger.debug('Diffs already exist for image: %s', image_id)
-    return image_trie_path, repo_image.storage.locations
-
-  image = model.image.get_image_by_id(namespace, repository, image_id)
-  parents = model.image.get_parent_images(namespace, repository, image)
-
-  # Compute the diffs and fs for the parent first if necessary
-  parent_trie_path = None
-  if parents:
-    parent_trie_path, parent_locations = process_image_changes(namespace, repository,
-                                                               parents[0].docker_image_id)
-
-  # Read in the collapsed layer state of the filesystem for the parent
-  parent_trie = changes.empty_fs()
-  if parent_trie_path:
-    parent_trie_bytes = store.get_content(parent_locations, parent_trie_path)
-    parent_trie.frombytes(parent_trie_bytes)
-
-  # Read in the file entries from the layer tar file
-  layer_path = model.storage.get_layer_path(repo_image.storage)
-  with store.stream_read_file(image.storage.locations, layer_path) as layer_tar_stream:
-    removed_files = set()
-    layer_files = changes.files_and_dirs_from_tar(layer_tar_stream,
-                                                  removed_files)
-
-    new_metadata = changes.compute_new_diffs_and_fs(parent_trie, layer_files, removed_files)
-  (new_trie, added, changed, removed) = new_metadata
-
-  # Write out the new trie
-  store.put_content(image.storage.locations, image_trie_path, new_trie.tobytes())
-
-  # Write out the diffs
-  diffs = {}
-  sections = ('added', 'changed', 'removed')
-  for section, source_trie in zip(sections, new_metadata[1:]):
-    diffs[section] = list(source_trie)
-    diffs[section].sort()
-  store.put_content(image.storage.locations, image_diffs_path, json.dumps(diffs, indent=2))
-
-  return image_trie_path, image.storage.locations