code-stye Yapf: 5 files updated
data/interfaces/appr.py endpoints/appr/cnr_backend.py endpoints/appr/registry.py endpoints/appr/test/test_api.py endpoints/appr/test/test_registry.py
This commit is contained in:
parent
578f87f94c
commit
599ce0de54
6 changed files with 112 additions and 130 deletions
|
@ -19,7 +19,6 @@ from endpoints.appr.decorators import disallow_for_image_repository
|
|||
from endpoints.decorators import anon_allowed, anon_protect
|
||||
from util.names import REPOSITORY_NAME_REGEX, TAG_REGEX
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -67,8 +66,7 @@ def login():
|
|||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/blobs/sha256/<string:digest>",
|
||||
methods=['GET'],
|
||||
strict_slashes=False,
|
||||
)
|
||||
strict_slashes=False,)
|
||||
@process_auth
|
||||
@require_app_repo_read
|
||||
@anon_protect
|
||||
|
@ -90,11 +88,8 @@ def list_packages():
|
|||
username = None
|
||||
if user:
|
||||
username = user.username
|
||||
result_data = cnr_registry.list_packages(namespace,
|
||||
package_class=Package,
|
||||
search=query,
|
||||
media_type=media_type,
|
||||
username=username)
|
||||
result_data = cnr_registry.list_packages(namespace, package_class=Package, search=query,
|
||||
media_type=media_type, username=username)
|
||||
return jsonify(result_data)
|
||||
|
||||
|
||||
|
@ -106,31 +101,23 @@ def list_packages():
|
|||
@anon_protect
|
||||
def delete_package(namespace, package_name, release, media_type):
|
||||
reponame = repo_name(namespace, package_name)
|
||||
result = cnr_registry.delete_package(reponame,
|
||||
release,
|
||||
media_type,
|
||||
package_class=Package)
|
||||
result = cnr_registry.delete_package(reponame, release, media_type, package_class=Package)
|
||||
return jsonify(result)
|
||||
|
||||
|
||||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/<string:release>/<string:media_type>",
|
||||
methods=['GET'],
|
||||
strict_slashes=False
|
||||
)
|
||||
methods=['GET'], strict_slashes=False)
|
||||
@process_auth
|
||||
@require_app_repo_read
|
||||
@anon_protect
|
||||
def show_package(namespace, package_name, release, media_type):
|
||||
reponame = repo_name(namespace, package_name)
|
||||
result = cnr_registry.show_package(reponame, release,
|
||||
media_type,
|
||||
channel_class=Channel,
|
||||
result = cnr_registry.show_package(reponame, release, media_type, channel_class=Channel,
|
||||
package_class=Package)
|
||||
return jsonify(result)
|
||||
|
||||
|
||||
|
||||
@appr_bp.route("/api/v1/packages/<string:namespace>/<string:package_name>", methods=['GET'],
|
||||
strict_slashes=False)
|
||||
@process_auth
|
||||
|
@ -139,8 +126,7 @@ def show_package(namespace, package_name, release, media_type):
|
|||
def show_package_releases(namespace, package_name):
|
||||
reponame = repo_name(namespace, package_name)
|
||||
media_type = request.args.get('media_type', None)
|
||||
result = cnr_registry.show_package_releases(reponame,
|
||||
media_type=media_type,
|
||||
result = cnr_registry.show_package_releases(reponame, media_type=media_type,
|
||||
package_class=Package)
|
||||
return jsonify(result)
|
||||
|
||||
|
@ -152,17 +138,14 @@ def show_package_releases(namespace, package_name):
|
|||
@anon_protect
|
||||
def show_package_releasse_manifests(namespace, package_name, release):
|
||||
reponame = repo_name(namespace, package_name)
|
||||
result = cnr_registry.show_package_manifests(reponame,
|
||||
release,
|
||||
package_class=Package)
|
||||
result = cnr_registry.show_package_manifests(reponame, release, package_class=Package)
|
||||
return jsonify(result)
|
||||
|
||||
|
||||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/<string:release>/<string:media_type>/pull",
|
||||
methods=['GET'],
|
||||
strict_slashes=False,
|
||||
)
|
||||
strict_slashes=False,)
|
||||
@process_auth
|
||||
@require_app_repo_read
|
||||
@anon_protect
|
||||
|
@ -192,12 +175,14 @@ def push(namespace, package_name):
|
|||
if not Package.exists(reponame):
|
||||
if not CreateRepositoryPermission(namespace).can():
|
||||
raise Forbidden("Unauthorized access for: %s" % reponame,
|
||||
{"package": reponame, "scopes": ['create']})
|
||||
{"package": reponame,
|
||||
"scopes": ['create']})
|
||||
Package.create_repository(reponame, private, owner)
|
||||
|
||||
if not ModifyRepositoryPermission(namespace, package_name).can():
|
||||
raise Forbidden("Unauthorized access for: %s" % reponame,
|
||||
{"package": reponame, "scopes": ['push']})
|
||||
{"package": reponame,
|
||||
"scopes": ['push']})
|
||||
|
||||
if not 'release' in values:
|
||||
raise InvalidUsage('Missing release')
|
||||
|
@ -237,7 +222,9 @@ def list_channels(namespace, package_name):
|
|||
return jsonify(cnr_registry.list_channels(reponame, channel_class=Channel))
|
||||
|
||||
|
||||
@appr_bp.route("/api/v1/packages/<string:namespace>/<string:package_name>/channels/<string:channel_name>", methods=['GET'], strict_slashes=False)
|
||||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/channels/<string:channel_name>",
|
||||
methods=['GET'], strict_slashes=False)
|
||||
@process_auth
|
||||
@require_app_repo_read
|
||||
@anon_protect
|
||||
|
@ -250,8 +237,7 @@ def show_channel(namespace, package_name, channel_name):
|
|||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/channels/<string:channel_name>/<string:release>",
|
||||
methods=['POST'],
|
||||
strict_slashes=False,
|
||||
)
|
||||
strict_slashes=False,)
|
||||
@process_auth
|
||||
@require_app_repo_write
|
||||
@anon_protect
|
||||
|
@ -262,6 +248,7 @@ def add_channel_release(namespace, package_name, channel_name, release):
|
|||
package_class=Package)
|
||||
return jsonify(result)
|
||||
|
||||
|
||||
def _check_channel_name(channel_name, release=None):
|
||||
if not TAG_REGEX.match(channel_name):
|
||||
logger.debug('Found invalid channel name CNR add channel release: %s', channel_name)
|
||||
|
@ -275,11 +262,11 @@ def _check_channel_name(channel_name, release=None):
|
|||
{'name': channel_name,
|
||||
"release": release})
|
||||
|
||||
|
||||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/channels/<string:channel_name>/<string:release>",
|
||||
methods=['DELETE'],
|
||||
strict_slashes=False,
|
||||
)
|
||||
strict_slashes=False,)
|
||||
@process_auth
|
||||
@require_app_repo_write
|
||||
@anon_protect
|
||||
|
@ -294,8 +281,7 @@ def delete_channel_release(namespace, package_name, channel_name, release):
|
|||
@appr_bp.route(
|
||||
"/api/v1/packages/<string:namespace>/<string:package_name>/channels/<string:channel_name>",
|
||||
methods=['DELETE'],
|
||||
strict_slashes=False,
|
||||
)
|
||||
strict_slashes=False,)
|
||||
@process_auth
|
||||
@require_app_repo_write
|
||||
@anon_protect
|
||||
|
|
Reference in a new issue