Fixes to ensuring existing code can process schema 2 manifests

data/registry_model/registry_oci_model.py

@@ -8,9 +8,11 @@ from data import model
 from data.model import oci, DataModelException
 from data.database import db_transaction, Image
 from data.registry_model.interface import RegistryDataInterface
-from data.registry_model.datatypes import Tag, Manifest, LegacyImage, Label, SecurityScanStatus
+from data.registry_model.datatypes import (Tag, Manifest, LegacyImage, Label, SecurityScanStatus,
+                                           RepositoryReference)
 from data.registry_model.shared import SharedModel
 from data.registry_model.label_handlers import apply_label_to_manifest
+from image.docker import ManifestException
 
 
 logger = logging.getLogger(__name__)
@@ -420,5 +422,27 @@ class OCIModel(SharedModel, RegistryDataInterface):
     """
     oci.tag.set_tag_expiration_sec_for_manifest(manifest._db_id, expiration_sec)
 
+  def get_schema1_parsed_manifest(self, manifest, namespace_name, repo_name, tag_name, storage):
+    """ Returns the schema 1 manifest for this manifest, or None if none. """
+    try:
+      parsed = manifest.get_parsed_manifest()
+    except ManifestException:
+      return None
+
+    try:
+      manifest_row = database.Manifest.get(id=manifest._db_id)
+    except database.Manifest.DoesNotExist:
+      return None
+
+    repository_ref = RepositoryReference.for_id(manifest_row.repository_id)
+
+    def _lookup_blob(digest):
+      blob = self.get_repo_blob_by_digest(repository_ref, digest, include_placements=True)
+      if blob is None:
+        return None
+
+      return storage.get_content(blob.placements, blob.storage_path)
+
+    return parsed.get_v1_compatible_manifest(namespace_name, repo_name, tag_name, _lookup_blob)
 
 oci_model = OCIModel()