Implement support for schema 2 manifests

data/model/oci/manifest.py

@@ -62,8 +62,7 @@ def _create_manifest(repository_id, manifest_interface_instance, storage):
   def _lookup_digest(digest):
     return _retrieve_bytes_in_storage(repository_id, digest, storage)
 
-  # Retrieve the child manifests, if any. If we do retrieve a child manifest, we also remove its
-  # blob from the list of blobs for this manifest, as the blob isn't really a "blob".
+  # Load, parse and get/create the child manifests, if any.
   child_manifest_refs = manifest_interface_instance.child_manifests(_lookup_digest)
   child_manifest_rows = []
   child_manifest_label_dicts = []
@@ -105,18 +104,15 @@ def _create_manifest(repository_id, manifest_interface_instance, storage):
 
       child_manifest_rows.append(child_manifest_info.manifest)
       child_manifest_label_dicts.append(labels)
-      digests.remove(child_manifest.digest)
 
   # Ensure all the blobs in the manifest exist.
-  blob_map = {}
-  if digests:
-    query = lookup_repo_storages_by_content_checksum(repository_id, digests)
-    blob_map = {s.content_checksum: s for s in query}
-    for digest_str in digests:
-      if digest_str not in blob_map:
-        logger.warning('Unknown blob `%s` under manifest `%s` for repository `%s`', digest_str,
-                       manifest_interface_instance.digest, repository_id)
-        return None
+  query = lookup_repo_storages_by_content_checksum(repository_id, digests)
+  blob_map = {s.content_checksum: s for s in query}
+  for digest_str in digests:
+    if digest_str not in blob_map:
+      logger.warning('Unknown blob `%s` under manifest `%s` for repository `%s`', digest_str,
+                     manifest_interface_instance.digest, repository_id)
+      return None
 
   # Determine and populate the legacy image if necessary. Manifest lists will not have a legacy
   # image.

data/registry_model/__init__.py

@@ -6,5 +6,17 @@ from data.registry_model.registry_oci_model import oci_model
 
 logger = logging.getLogger(__name__)
 
-registry_model = oci_model if os.getenv('OCI_DATA_MODEL') == 'true' else pre_oci_model
-logger.debug('Using registry model `%s`', registry_model)
+
+class RegistryModelProxy(object):
+  def __init__(self):
+    self._model = oci_model if os.getenv('OCI_DATA_MODEL') == 'true' else pre_oci_model
+
+  def set_for_testing(self, use_oci_model):
+    self._model = oci_model if use_oci_model else pre_oci_model
+    logger.debug('Changed registry model to `%s` for testing', self._model)
+
+  def __getattr__(self, attr):
+    return getattr(self._model, attr)
+
+registry_model = RegistryModelProxy()
+logger.debug('Using registry model `%s`', registry_model._model)

data/registry_model/interface.py

@@ -7,6 +7,10 @@ class RegistryDataInterface(object):
       of all tables that store registry-specific information, such as Manifests, Blobs, Images,
       and Labels.
   """
+  @abstractmethod
+  def supports_schema2(self, namespace_name):
+    """ Returns whether the implementation of the data interface supports schema 2 format
+        manifests. """
 
   @abstractmethod
   def find_matching_tag(self, repository_ref, tag_names):

data/registry_model/registry_oci_model.py

@@ -21,6 +21,10 @@ class OCIModel(SharedModel, RegistryDataInterface):
   OCIModel implements the data model for the registry API using a database schema
   after it was changed to support the OCI specification.
   """
+  def supports_schema2(self, namespace_name):
+    """ Returns whether the implementation of the data interface supports schema 2 format
+        manifests. """
+    return True
 
   def find_matching_tag(self, repository_ref, tag_names):
     """ Finds an alive tag in the repository matching one of the given tag names and returns it

data/registry_model/registry_pre_oci_model.py

@@ -27,6 +27,10 @@ class PreOCIModel(SharedModel, RegistryDataInterface):
   PreOCIModel implements the data model for the registry API using a database schema
   before it was changed to support the OCI specification.
   """
+  def supports_schema2(self, namespace_name):
+    """ Returns whether the implementation of the data interface supports schema 2 format
+        manifests. """
+    return False
 
   def find_matching_tag(self, repository_ref, tag_names):
     """ Finds an alive tag in the repository matching one of the given tag names and returns it