endpoints.verbs: abort 405 for non-container repos

This commit is contained in:
Jimmy Zelinskie 2017-03-22 17:50:26 -04:00
parent 40b638a981
commit d5fa2ad0c0
2 changed files with 52 additions and 16 deletions

View file

@ -9,6 +9,19 @@ from data import model
from image.docker.v1 import DockerV1Metadata
class Repository(namedtuple('Repository', ['id', 'name', 'namespace_name', 'description',
'is_public', 'kind'])):
"""
Repository represents a namespaced collection of tags.
:type id: int
:type name: string
:type namespace_name: string
:type description: string
:type is_public: bool
:type kind: string
"""
class DerivedImage(namedtuple('DerivedImage', ['ref', 'blob', 'internal_source_image_db_id'])):
"""
DerivedImage represents a user-facing alias for an image which was derived from another image.
@ -43,9 +56,10 @@ class VerbsDataInterface(object):
verbs.
"""
@abstractmethod
def repository_is_public(self, namespace_name, repo_name):
def get_repository(self, namespace_name, repo_name):
"""
Returns a boolean for whether the repository with the given name and namespace is public.
Returns a repository tuple for the repository with the given name under the given namespace.
Returns None if no such repository was found.
"""
pass
@ -144,8 +158,8 @@ class PreOCIModel(VerbsDataInterface):
before it was changed to support the OCI specification.
"""
def repository_is_public(self, namespace_name, repo_name):
return model.repository.repository_is_public(namespace_name, repo_name)
def get_repository(self, namespace_name, repo_name):
return _repository_for_repo(model.repository.get_repository(namespace_name, repo_name))
def get_manifest_layers_with_blobs(self, repo_image):
repo_image_record = model.image.get_image_by_id(repo_image.repository.namespace_name,
@ -320,3 +334,14 @@ def _blob(blob_record):
uploading=blob_record.uploading,
locations=locations,
)
def _repository_for_repo(repo):
""" Returns a Repository object representing the Pre-OCI data model repo instance given. """
return Repository(
id=repo.id,
name=repo.name,
namespace_name=repo.namespace_user.username,
description=repo.description,
is_public=model.repository.is_repository_public(repo),
kind=model.repository.get_repo_kind_name(repo),
)