mv data/types image

This change also merges formats into the new image module.

endpoints/v2/manifest.py

@@ -9,13 +9,6 @@ import features
 from app import docker_v2_signing_key, app, metric_queue
 from auth.registry_jwt_auth import process_registry_jwt_auth
 from data import model
-from data.types import (
-  DockerSchema1Manifest,
-  DockerSchema1ManifestBuilder,
-  ManifestException,
-  DOCKER_SCHEMA1_MANIFEST_CONTENT_TYPE,
-  DOCKER_SCHEMA2_CONTENT_TYPES,
-)
 from digest import digest_tools
 from endpoints.common import parse_repository_name
 from endpoints.decorators import anon_protect
@@ -24,6 +17,9 @@ from endpoints.v2.errors import (BlobUnknown, ManifestInvalid, ManifestUnknown,
                                  NameInvalid)
 from endpoints.trackhelper import track_and_log
 from endpoints.notificationhelper import spawn_notification
+from image.docker import ManifestException
+from image.docker.schema1 import DockerSchema1Manifest, DockerSchema1ManifestBuilder
+from image.docker.schema2 import DOCKER_SCHEMA2_CONTENT_TYPES
 from util.registry.replication import queue_storage_replication
 from util.names import VALID_TAG_PATTERN
 
@@ -56,7 +52,7 @@ def fetch_manifest_by_tagname(namespace_name, repo_name, tag_name):
     metric_queue.repository_pull.Inc(labelvalues=[namespace_name, repo_name, 'v2'])
 
   response = make_response(manifest.bytes, 200)
-  response.headers['Content-Type'] = DOCKER_SCHEMA1_MANIFEST_CONTENT_TYPE
+  response.headers['Content-Type'] = manifest.content_type
   response.headers['Docker-Content-Digest'] = manifest.digest
   return response
 
@@ -78,7 +74,7 @@ def fetch_manifest_by_digest(namespace_name, repo_name, manifest_ref):
     metric_queue.repository_pull.Inc(labelvalues=[namespace_name, repo_name, 'v2'])
 
   response = make_response(manifest.json, 200)
-  response.headers['Content-Type'] = DOCKER_SCHEMA1_MANIFEST_CONTENT_TYPE
+  response.headers['Content-Type'] = manifest.content_type
   response.headers['Docker-Content-Digest'] = manifest.digest
   return response
 
@@ -151,16 +147,15 @@ def _write_manifest(namespace_name, repo_name, manifest):
   # Ensure all the blobs in the manifest exist.
   storage_query = model.storage.lookup_repo_storages_by_content_checksum(repo, manifest.checksums)
   storage_map = {storage.content_checksum: storage for storage in storage_query}
-  for extracted_layer_metadata in manifest.layers:
-    digest_str = str(extracted_layer_metadata.digest)
+  for layer in manifest.layers:
+    digest_str = str(layer.digest)
     if digest_str not in storage_map:
       raise BlobUnknown(detail={'digest': digest_str})
 
   # Lookup all the images and their parent images (if any) inside the manifest.
   # This will let us know which v1 images we need to synthesize and which ones are invalid.
   all_image_ids = list(manifest.docker_image_ids | manifest.parent_image_ids)
-  images = v2.docker_v1_metadata_by_image_id(namespace_name, repo_name, all_image_ids)
-  images_map = {image.image_id: image for image in images}
+  images_map = v2.docker_v1_metadata_by_image_id(namespace_name, repo_name, all_image_ids)
 
   # Rewrite any v1 image IDs that do not match the checksum in the database.
   try:
@@ -181,14 +176,14 @@ def _write_manifest(namespace_name, repo_name, manifest):
     raise ManifestInvalid(detail={'message': me.message})
 
   # Store the manifest pointing to the tag.
-  leaf_layer_id = images_map[manifest.layers[-1].v1_metadata.image_id].image_id
+  leaf_layer_id = images_map[manifest.leaf_layer.v1_metadata.image_id].image_id
   v2.save_manifest(namespace_name, repo_name, tag_name, leaf_layer_id, manifest.digest, manifest.bytes)
 
   # Queue all blob manifests for replication.
   # TODO(jschorr): Find a way to optimize this insertion.
   if features.STORAGE_REPLICATION:
-    for extracted_v1_metadata in manifest.layers:
-      digest_str = str(extracted_v1_metadata.digest)
+    for layer in manifest.layers:
+      digest_str = str(layer.digest)
       queue_storage_replication(namespace_name, storage_map[digest_str])
 
   track_and_log('push_repo', repo, tag=manifest.tag)