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

Switch image API to use a data interface

Browse source
This commit is contained in:
Joseph Schorr 2017-07-21 14:38:31 -04:00
parent 9b22afd8fd
commit 95850b6148
3 changed files with 99 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

80
endpoints/api/image.py
View file

@ -1,46 +1,9 @@
""" List and lookup repository images. """
import json
from collections import defaultdict
from endpoints.api import (resource, nickname, require_repo_read, RepositoryParamResource,
format_date, path_param, disallow_for_app_repositories)
path_param, disallow_for_app_repositories)
from endpoints.api.image_models_pre_oci import pre_oci_model as model
from endpoints.exception import NotFound
from data import model
def image_view(image, image_map, include_ancestors=True):
command = image.command
def docker_id(aid):
if aid not in image_map:
return ''
return image_map[aid].docker_image_id
image_data = {
'id': image.docker_image_id,
'created': format_date(image.created),
'comment': image.comment,
'command': json.loads(command) if command else None,
'size': image.storage.image_size,
'uploading': image.storage.uploading,
'sort_index': len(image.ancestors),
}
if include_ancestors:
# Calculate the ancestors string, with the DBID's replaced with the docker IDs.
ancestors = [docker_id(a) for a in image.ancestor_id_list()]
image_data['ancestors'] = '/{0}/'.format('/'.join(ancestors))
return image_data
def historical_image_view(image, image_map):
ancestors = [image_map[a] for a in image.ancestor_id_list()]
normal_view = image_view(image, image_map)
normal_view['history'] = [image_view(parent, image_map, False) for parent in ancestors]
return normal_view
@resource('/v1/repository/<apirepopath:repository>/image/')
@ -53,33 +16,11 @@ class RepositoryImageList(RepositoryParamResource):
@disallow_for_app_repositories
def get(self, namespace, repository):
""" List the images for the specified repository. """
repo = model.repository.get_repository(namespace, repository)
if not repo:
images = model.get_repository_images(namespace, repository)
if images is None:
raise NotFound()
all_images = model.image.get_repository_images_without_placements(repo)
all_tags = model.tag.list_repository_tags(namespace, repository)
tags_by_docker_id = defaultdict(list)
found_image_ids = set()
for tag in all_tags:
tags_by_docker_id[tag.image.docker_image_id].append(tag.name)
found_image_ids.add(tag.image.id)
found_image_ids.update(tag.image.ancestor_id_list())
image_map = {}
filtered_images = []
for image in all_images:
if image.id in found_image_ids:
image_map[image.id] = image
filtered_images.append(image)
def add_tags(image_json):
image_json['tags'] = tags_by_docker_id[image_json['id']]
return image_json
return {'images': [add_tags(image_view(image, image_map)) for image in filtered_images]}
return {'images': [image.to_dict() for image in images]}
@resource('/v1/repository/<apirepopath:repository>/image/<image_id>')
@ -93,13 +34,8 @@ class RepositoryImage(RepositoryParamResource):
@disallow_for_app_repositories
def get(self, namespace, repository, image_id):
""" Get the information available for the specified image. """
image = model.image.get_repo_image_extended(namespace, repository, image_id)
if not image:
image = model.get_repository_image(namespace, repository, image_id)
if image is None:
raise NotFound()
# Lookup all the ancestor images for the image.
image_map = {}
for current_image in model.image.get_parent_images(namespace, repository, image):
image_map[current_image.id] = current_image
return historical_image_view(image, image_map)
return image.to_dict()