Revert "Merge pull request #557 from coreos-inc/revert-migration"

This reverts commit c4f938898a, reversing
changes made to 7ad2522dbe.

endpoints/api/image.py

@@ -12,11 +12,7 @@ from util.cache import cache_control_flask_restful
 
 
 def image_view(image, image_map, include_ancestors=True):
-  extended_props = image
-  if image.storage and image.storage.id:
-    extended_props = image.storage
-
-  command = extended_props.command
+  command = image.command
 
   def docker_id(aid):
     if not aid or not aid in image_map:
@@ -26,10 +22,10 @@ def image_view(image, image_map, include_ancestors=True):
 
   image_data = {
     'id': image.docker_image_id,
-    'created': format_date(extended_props.created),
-    'comment': extended_props.comment,
+    'created': format_date(image.created),
+    'comment': image.comment,
     'command': json.loads(command) if command else None,
-    'size': extended_props.image_size,
+    'size': image.storage.image_size,
     'uploading': image.storage.uploading,
     'sort_index': len(image.ancestors),
   }

endpoints/api/repository.py

@@ -254,7 +254,7 @@ class Repository(RepositoryParamResource):
       tag_info = {
         'name': tag.name,
         'image_id': tag.image.docker_image_id,
-        'size': tag.image.storage.aggregate_size
+        'size': tag.image.aggregate_size
       }
 
       if tag.lifetime_start_ts > 0:

endpoints/v1/registry.py

@@ -211,11 +211,10 @@ def put_image_layer(namespace, repository, image_id):
   try:
     logger.debug('Retrieving image data')
     uuid = repo_image.storage.uuid
-    json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
-  except (IOError, AttributeError):
+    json_data = repo_image.v1_json_metadata
+  except (AttributeError):
     logger.exception('Exception when retrieving image data')
-    abort(404, 'Image %(image_id)s not found', issue='unknown-image',
-          image_id=image_id)
+    abort(404, 'Image %(image_id)s not found', issue='unknown-image', image_id=image_id)
 
   logger.debug('Retrieving image path info')
   layer_path = store.image_layer_path(uuid)
@@ -332,8 +331,7 @@ def put_image_checksum(namespace, repository, image_id):
     abort(404, 'Image not found: %(image_id)s', issue='unknown-image', image_id=image_id)
 
   logger.debug('Looking up repo layer data')
-  uuid = repo_image.storage.uuid
-  if not store.exists(repo_image.storage.locations, store.image_json_path(uuid)):
+  if not repo_image.v1_json_metadata:
     abort(404, 'Image not found: %(image_id)s', issue='unknown-image', image_id=image_id)
 
   logger.debug('Marking image path')
@@ -373,12 +371,7 @@ def get_image_json(namespace, repository, image_id, headers):
 
   logger.debug('Looking up repo image')
   repo_image = model.image.get_repo_image_extended(namespace, repository, image_id)
-
-  logger.debug('Looking up repo layer data')
-  try:
-    uuid = repo_image.storage.uuid
-    data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
-  except (IOError, AttributeError):
+  if repo_image is None:
     flask_abort(404)
 
   logger.debug('Looking up repo layer size')
@@ -388,7 +381,7 @@ def get_image_json(namespace, repository, image_id, headers):
     # so handle this case rather than failing.
     headers['X-Docker-Size'] = str(size)
 
-  response = make_response(data, 200)
+  response = make_response(repo_image.v1_json_metadata, 200)
   response.headers.extend(headers)
   return response
 
@@ -491,8 +484,6 @@ def put_image_json(namespace, repository, image_id):
   model.tag.create_temporary_hidden_tag(repo, repo_image,
                                         app.config['PUSH_TEMP_TAG_EXPIRATION_SEC'])
 
-  uuid = repo_image.storage.uuid
-
   if image_id != data['id']:
     abort(400, 'JSON data contains invalid id for image: %(image_id)s',
           issue='invalid-request', image_id=image_id)
@@ -510,17 +501,12 @@ def put_image_json(namespace, repository, image_id):
   if parent_id:
     logger.debug('Looking up parent image data')
 
-  if (parent_id and not
-      store.exists(parent_locations, store.image_json_path(parent_uuid))):
+  if parent_id and not parent_image.v1_json_metadata:
     abort(400, 'Image %(image_id)s depends on non existing parent image %(parent_id)s',
           issue='invalid-request', image_id=image_id, parent_id=parent_id)
 
-  logger.debug('Looking up image storage paths')
-  json_path = store.image_json_path(uuid)
-
   logger.debug('Checking if image already exists')
-  if (store.exists(repo_image.storage.locations, json_path) and not
-      image_is_uploading(repo_image)):
+  if repo_image.v1_json_metadata and not image_is_uploading(repo_image):
     exact_abort(409, 'Image already exists')
 
   set_uploading_flag(repo_image, True)
@@ -536,6 +522,8 @@ def put_image_json(namespace, repository, image_id):
                                  data.get('comment'), command, v1_metadata, parent_image)
 
   logger.debug('Putting json path')
+  uuid = repo_image.storage.uuid
+  json_path = store.image_json_path(uuid)
   store.put_content(repo_image.storage.locations, json_path, request.data)
 
   logger.debug('Generating image ancestry')

endpoints/verbs.py

@@ -114,17 +114,15 @@ def _verify_repo_verb(store, namespace, repository, tag, verb, checker=None):
     abort(404)
 
   # Lookup the tag's image and storage.
-  repo_image = model.image.get_repo_image_extended(namespace, repository, tag_image.docker_image_id)
+  repo_image = model.image.get_repo_image(namespace, repository, tag_image.docker_image_id)
   if not repo_image:
     abort(404)
 
   # If there is a data checker, call it first.
-  uuid = repo_image.storage.uuid
   image_json = None
 
   if checker is not None:
-    image_json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
-    image_json = json.loads(image_json_data)
+    image_json = json.loads(repo_image.v1_json_metadata)
 
     if not checker(image_json):
       logger.debug('Check mismatch on %s/%s:%s, verb %s', namespace, repository, tag, verb)
@@ -193,8 +191,7 @@ def _repo_verb(namespace, repository, tag, verb, formatter, sign=False, checker=
 
   # Load the image's JSON layer.
   if not image_json:
-    image_json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
-    image_json = json.loads(image_json_data)
+    image_json = json.loads(repo_image.v1_json_metadata)
 
   # Calculate a synthetic image ID.
   synthetic_image_id = hashlib.sha256(tag_image.docker_image_id + ':' + verb).hexdigest()