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

add "get_" prefix to all db read funcs

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-08-03 14:00:40 -04:00
parent 56951397a9
commit b68e1b5efc
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/model/v2.py
View file

@ -53,7 +53,7 @@ def delete_tag(namespace_name, repo_name, tag_name):
return True return True
def docker_v1_metadata_by_tag(namespace_name, repo_name, tag_name): def get_docker_v1_metadata_by_tag(namespace_name, repo_name, tag_name):
if not repo_image: if not repo_image:
return None return None
@ -67,7 +67,7 @@ def docker_v1_metadata_by_tag(namespace_name, repo_name, tag_name):
) )
def docker_v1_metadata_by_image_id(namespace_name, repo_name, image_ids): def get_docker_v1_metadata_by_image_id(namespace_name, repo_name, image_ids):
images_query = model.image.lookup_repository_images(repo, all_image_ids) images_query = model.image.lookup_repository_images(repo, all_image_ids)
return {image.docker_image_id: DockerV1Metadata(namespace_name=namespace_name, return {image.docker_image_id: DockerV1Metadata(namespace_name=namespace_name,
repo_name=repo_name, repo_name=repo_name,
@ -166,7 +166,7 @@ def create_blob_and_temp_tag(namespace_name, repo_name, expected_digest, upload_
upload_obj.uncompressed_byte_count) upload_obj.uncompressed_byte_count)
def blob_by_digest(namespace_name, repo_name, digest): def get_blob_by_digest(namespace_name, repo_name, digest):
try: try:
return model.blob.get_repo_blob_by_digest(namespace_name, repo_name, digest) return model.blob.get_repo_blob_by_digest(namespace_name, repo_name, digest)
except model.BlobDoesNotExist: except model.BlobDoesNotExist:

4
endpoints/v2/blob.py
View file

@ -41,7 +41,7 @@ class _InvalidRangeHeader(Exception):
@cache_control(max_age=31436000) @cache_control(max_age=31436000)
def check_blob_exists(namespace_name, repo_name, digest): def check_blob_exists(namespace_name, repo_name, digest):
# Find the blob. # Find the blob.
blob = v2.blob_by_digest(namespace_name, repo_name, digest) blob = v2.get_blob_by_digest(namespace_name, repo_name, digest)
if blob is None: if blob is None:
raise BlobUnknown() raise BlobUnknown()
@ -70,7 +70,7 @@ def check_blob_exists(namespace_name, repo_name, digest):
@cache_control(max_age=31536000) @cache_control(max_age=31536000)
def download_blob(namespace_name, repo_name, digest): def download_blob(namespace_name, repo_name, digest):
# Find the blob. # Find the blob.
blob = v2.blob_by_digest(namespace_name, repo_name, digest) blob = v2.get_blob_by_digest(namespace_name, repo_name, digest)
if blob is None: if blob is None:
raise BlobUnknown() raise BlobUnknown()

4
endpoints/v2/manifest.py
View file

@ -155,7 +155,7 @@ def _write_manifest(namespace_name, repo_name, manifest):
# Lookup all the images and their parent images (if any) inside the manifest. # 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. # 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) all_image_ids = list(manifest.docker_image_ids | manifest.parent_image_ids)
images_map = v2.docker_v1_metadata_by_image_id(namespace_name, repo_name, all_image_ids) images_map = v2.get_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. # Rewrite any v1 image IDs that do not match the checksum in the database.
try: try:
@ -228,7 +228,7 @@ def delete_manifest_by_digest(namespace_name, repo_name, digest):
def _generate_and_store_manifest(namespace_name, repo_name, tag_name): def _generate_and_store_manifest(namespace_name, repo_name, tag_name):
# Find the v1 metadata for this image and its parents. # Find the v1 metadata for this image and its parents.
v1_metadata = v2.docker_v1_metadata_by_tag(namespace_name, repo_name, tag_name) v1_metadata = v2.get_docker_v1_metadata_by_tag(namespace_name, repo_name, tag_name)
parents_v1_metadata = v2.get_parents_docker_v1_metadata(namespace_name, repo_name, parents_v1_metadata = v2.get_parents_docker_v1_metadata(namespace_name, repo_name,
v1_metadata.image_id) v1_metadata.image_id)