refactor(endpoints/api/tag): refactor code for v22
this decouples the database models from the api [TESTING->locally with docker compose] Issue: https://coreosdev.atlassian.net/browse/QUAY-632 - [ ] It works! - [ ] Comments provide sufficient explanations for the next contributor - [ ] Tests cover changes and corner cases - [ ] Follows Quay syntax patterns and format
This commit is contained in:
Charlton Austin
parent
a3afd37c41
commit
fc4b3642d3
7 changed files with 483 additions and 67 deletions
|
|
@ -3,12 +3,13 @@
|
|||
from flask import request, abort
|
||||
|
||||
from auth.auth_context import get_authenticated_user
|
||||
from data import model
|
||||
from data.model import DataModelException
|
||||
from endpoints.api import (resource, nickname, require_repo_read, require_repo_write,
|
||||
RepositoryParamResource, log_action, validate_json_request, path_param,
|
||||
parse_args, query_param, truthy_bool, disallow_for_app_repositories)
|
||||
from endpoints.api.image import image_view
|
||||
from endpoints.api.tag_models_pre_oci import pre_oci_model
|
||||
from endpoints.api.image import image_view_pre_oci
|
||||
from endpoints.api.tag_models_interface import Repository
|
||||
from endpoints.api.tag_models_pre_oci import pre_oci_model as model
|
||||
from endpoints.exception import NotFound
|
||||
from endpoints.v2.manifest import _generate_and_store_manifest
|
||||
from util.names import TAG_ERROR, TAG_REGEX
|
||||
|
|
@ -51,7 +52,7 @@ class ListRepositoryTags(RepositoryParamResource):
|
|||
page = max(1, parsed_args.get('page', 1))
|
||||
limit = min(100, max(1, parsed_args.get('limit', 50)))
|
||||
|
||||
tag_history = pre_oci_model.list_repository_tag_history(namespace_name=namespace,
|
||||
tag_history = model.list_repository_tag_history(namespace_name=namespace,
|
||||
repository_name=repository, page=page,
|
||||
size=limit, specific_tag=specific_tag)
|
||||
|
||||
|
|
@ -74,7 +75,7 @@ class RepositoryTag(RepositoryParamResource):
|
|||
'MoveTag': {
|
||||
'type': 'object',
|
||||
'description': 'Description of to which image a new or existing tag should point',
|
||||
'required': ['image',],
|
||||
'required': ['image', ],
|
||||
'properties': {
|
||||
'image': {
|
||||
'type': 'string',
|
||||
|
|
@ -95,20 +96,12 @@ class RepositoryTag(RepositoryParamResource):
|
|||
abort(400, TAG_ERROR)
|
||||
|
||||
image_id = request.get_json()['image']
|
||||
image = model.image.get_repo_image(namespace, repository, image_id)
|
||||
if not image:
|
||||
repo = model.get_repo(namespace, repository, image_id)
|
||||
if not repo:
|
||||
raise NotFound()
|
||||
|
||||
original_image_id = None
|
||||
try:
|
||||
original_tag_image = model.tag.get_repo_tag_image(image.repository, tag)
|
||||
if original_tag_image:
|
||||
original_image_id = original_tag_image.docker_image_id
|
||||
except model.DataModelException:
|
||||
# This is a new tag.
|
||||
pass
|
||||
|
||||
model.tag.create_or_update_tag(namespace, repository, tag, image_id)
|
||||
original_image_id = model.get_repo_tag_image(repo, tag)
|
||||
model.create_or_update_tag(namespace, repository, tag, image_id)
|
||||
|
||||
username = get_authenticated_user().username
|
||||
log_action('move_tag' if original_image_id else 'create_tag', namespace, {
|
||||
|
|
@ -118,7 +111,7 @@ class RepositoryTag(RepositoryParamResource):
|
|||
'namespace': namespace,
|
||||
'image': image_id,
|
||||
'original_image': original_image_id
|
||||
}, repo=model.repository.get_repository(namespace, repository))
|
||||
}, repo=repo)
|
||||
|
||||
_generate_and_store_manifest(namespace, repository, tag)
|
||||
|
||||
|
|
@ -129,14 +122,14 @@ class RepositoryTag(RepositoryParamResource):
|
|||
@nickname('deleteFullTag')
|
||||
def delete(self, namespace, repository, tag):
|
||||
""" Delete the specified repository tag. """
|
||||
model.tag.delete_tag(namespace, repository, tag)
|
||||
model.delete_tag(namespace, repository, tag)
|
||||
|
||||
username = get_authenticated_user().username
|
||||
log_action('delete_tag', namespace,
|
||||
{'username': username,
|
||||
'repo': repository,
|
||||
'namespace': namespace,
|
||||
'tag': tag}, repo=model.repository.get_repository(namespace, repository))
|
||||
'tag': tag}, repo=Repository(namespace_name=namespace, repository_name=repository))
|
||||
|
||||
return '', 204
|
||||
|
||||
|
|
@ -156,17 +149,15 @@ class RepositoryTagImages(RepositoryParamResource):
|
|||
def get(self, namespace, repository, tag, parsed_args):
|
||||
""" List the images for the specified repository tag. """
|
||||
try:
|
||||
tag_image = model.tag.get_tag_image(namespace, repository, tag)
|
||||
except model.DataModelException:
|
||||
tag_image = model.get_repo_tag_image(Repository(namespace_name=namespace, repository_name=repository), tag)
|
||||
except DataModelException:
|
||||
raise NotFound()
|
||||
|
||||
parent_images = model.image.get_parent_images(namespace, repository, tag_image)
|
||||
image_map = {}
|
||||
|
||||
image_map[str(tag_image.id)] = tag_image
|
||||
parent_images = model.get_parent_images(namespace, repository, tag_image.docker_image_id)
|
||||
image_map = {str(tag_image.docker_image_id): tag_image}
|
||||
|
||||
for image in parent_images:
|
||||
image_map[str(image.id)] = image
|
||||
image_map[str(image.docker_image_id)] = image
|
||||
|
||||
image_map_all = dict(image_map)
|
||||
all_images = [tag_image] + list(parent_images)
|
||||
|
|
@ -174,13 +165,13 @@ class RepositoryTagImages(RepositoryParamResource):
|
|||
# Filter the images returned to those not found in the ancestry of any of the other tags in
|
||||
# the repository.
|
||||
if parsed_args['owned']:
|
||||
all_tags = model.tag.list_repository_tags(namespace, repository)
|
||||
all_tags = model.list_repository_tags(namespace, repository)
|
||||
for current_tag in all_tags:
|
||||
if current_tag.name == tag:
|
||||
continue
|
||||
|
||||
# Remove the tag's image ID.
|
||||
tag_image_id = str(current_tag.image_id)
|
||||
tag_image_id = str(current_tag.docker_image_id)
|
||||
image_map.pop(tag_image_id, None)
|
||||
|
||||
# Remove any ancestors:
|
||||
|
|
@ -189,8 +180,8 @@ class RepositoryTagImages(RepositoryParamResource):
|
|||
|
||||
return {
|
||||
'images': [
|
||||
image_view(image, image_map_all) for image in all_images
|
||||
if not parsed_args['owned'] or (str(image.id) in image_map)
|
||||
image_view_pre_oci(image, image_map_all) for image in all_images
|
||||
if not parsed_args['owned'] or (str(image.docker_image_id) in image_map)
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -204,7 +195,7 @@ class RestoreTag(RepositoryParamResource):
|
|||
'RestoreTag': {
|
||||
'type': 'object',
|
||||
'description': 'Restores a tag to a specific image',
|
||||
'required': ['image',],
|
||||
'required': ['image', ],
|
||||
'properties': {
|
||||
'image': {
|
||||
'type': 'string',
|
||||
|
|
@ -224,7 +215,6 @@ class RestoreTag(RepositoryParamResource):
|
|||
@validate_json_request('RestoreTag')
|
||||
def post(self, namespace, repository, tag):
|
||||
""" Restores a repository tag back to a previous image in the repository. """
|
||||
repo = model.repository.get_repository(namespace, repository)
|
||||
|
||||
# Restore the tag back to the previous image.
|
||||
image_id = request.get_json()['image']
|
||||
|
|
@ -238,18 +228,17 @@ class RestoreTag(RepositoryParamResource):
|
|||
'tag': tag,
|
||||
'image': image_id,
|
||||
}
|
||||
|
||||
repo = Repository(namespace, repository)
|
||||
if manifest_digest is not None:
|
||||
existing_image = model.tag.restore_tag_to_manifest(repo, tag, manifest_digest)
|
||||
existing_image = model.restore_tag_to_manifest(repo, tag, manifest_digest)
|
||||
else:
|
||||
existing_image = model.tag.restore_tag_to_image(repo, tag, image_id)
|
||||
existing_image = model.restore_tag_to_image(repo, tag, image_id)
|
||||
_generate_and_store_manifest(namespace, repository, tag)
|
||||
|
||||
if existing_image is not None:
|
||||
log_data['original_image'] = existing_image.docker_image_id
|
||||
|
||||
log_action('revert_tag', namespace, log_data, repo=model.repository.get_repository(namespace,
|
||||
repository))
|
||||
log_action('revert_tag', namespace, log_data, repo=repo)
|
||||
|
||||
return {
|
||||
'image_id': image_id,
|
||||
|
|
|
|||
Reference in a new issue