vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch the registry data model types to our own class constructor

Browse source 
This allows us to hide the DB ID from external-to-the-package users of the types and will allow us to add model-level caching as well
This commit is contained in:
Joseph Schorr 2018-08-17 17:57:27 -04:00
parent 9f96e595ac
commit 8aafbf8b8c
2 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/registry_model/registry_pre_oci_model.py
View file

@ -1,3 +1,5 @@
# pylint: disable=protected-access
from data import database
from data import model
from data.registry_model.interface import RegistryDataInterface
@ -14,14 +16,14 @@ class PreOCIModel(RegistryDataInterface):
""" Finds an alive tag in the repository matching one of the given tag names and returns it
or None if none.
"""
found_tag = model.tag.find_matching_tag(repository_ref.repo_id, tag_names)
found_tag = model.tag.find_matching_tag(repository_ref._db_id, tag_names)
return Tag.for_repository_tag(found_tag)
def get_most_recent_tag(self, repository_ref):
""" Returns the most recently pushed alive tag in the repository, if any. If none, returns
None.
"""
found_tag = model.tag.get_most_recent_tag(repository_ref.repo_id)
found_tag = model.tag.get_most_recent_tag(repository_ref._db_id)
return Tag.for_repository_tag(found_tag)
def lookup_repository(self, namespace_name, repo_name, kind_filter=None):
@ -33,7 +35,7 @@ class PreOCIModel(RegistryDataInterface):
def get_manifest_for_tag(self, tag):
""" Returns the manifest associated with the given tag. """
try:
tag_manifest = database.TagManifest.get(tag_id=tag.id)
tag_manifest = database.TagManifest.get(tag_id=tag._db_id)
except database.TagManifest.DoesNotExist:
return
@ -42,7 +44,7 @@ class PreOCIModel(RegistryDataInterface):
def lookup_manifest_by_digest(self, repository_ref, manifest_digest, allow_dead=False):
""" Looks up the manifest with the given digest under the given repository and returns it
or None if none. """
repo = model.repository.lookup_repository(repository_ref.repo_id)
repo = model.repository.lookup_repository(repository_ref._db_id)
if repo is None:
return None
@ -54,7 +56,7 @@ class PreOCIModel(RegistryDataInterface):
def create_manifest_label(self, manifest, key, value, source_type_name, media_type_name=None):
""" Creates a label on the manifest with the given key and value. """
try:
tag_manifest = database.TagManifest.get(id=manifest.id)
tag_manifest = database.TagManifest.get(id=manifest._db_id)
except database.TagManifest.DoesNotExist:
return