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

Revert "Merge pull request #2844 from coreos-inc/alegrand/use_latest_appr_server_code"

Browse source 
This reverts commit 646fafb2fd, reversing
changes made to 5c1b635439.
This commit is contained in:
Jimmy Zelinskie 2017-08-09 20:45:46 -04:00
parent 49df658e20
commit 9e09612851
16 changed files with 68 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

44
endpoints/appr/registry.py
View file

@ -1,11 +1,11 @@
import logging
from base64 import b64encode
import appr
from appr.api.impl import registry as appr_registry
from appr.api.registry import _pull, repo_name
from appr.exception import (
ChannelNotFound, ApprException, Forbidden, InvalidParams, InvalidRelease, InvalidUsage,
import cnr
from cnr.api.impl import registry as cnr_registry
from cnr.api.registry import _pull, repo_name
from cnr.exception import (
ChannelNotFound, CnrException, Forbidden, InvalidParams, InvalidRelease, InvalidUsage,
PackageAlreadyExists, PackageNotFound, PackageReleaseNotFound, UnableToLockResource,
UnauthorizedAccess, Unsupported)
from flask import jsonify, request
@ -14,7 +14,7 @@ from auth.auth_context import get_authenticated_user
from auth.decorators import process_auth
from auth.permissions import CreateRepositoryPermission, ModifyRepositoryPermission
from endpoints.appr import appr_bp, require_app_repo_read, require_app_repo_write
from endpoints.appr.appr_backend import Blob, Channel, Package, User
from endpoints.appr.cnr_backend import Blob, Channel, Package, User
from endpoints.appr.decorators import disallow_for_image_repository
from endpoints.appr.models_oci import model
from endpoints.decorators import anon_allowed, anon_protect
@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
@appr_bp.errorhandler(UnauthorizedAccess)
@appr_bp.errorhandler(PackageNotFound)
@appr_bp.errorhandler(PackageReleaseNotFound)
@appr_bp.errorhandler(ApprException)
@appr_bp.errorhandler(CnrException)
@appr_bp.errorhandler(InvalidUsage)
@appr_bp.errorhandler(InvalidParams)
@appr_bp.errorhandler(ChannelNotFound)
@ -44,7 +44,7 @@ def render_error(error):
@appr_bp.route("/version")
@anon_allowed
def version():
return jsonify({"appr-api": appr.__version__})
return jsonify({"cnr-api": cnr.__version__})
@appr_bp.route("/api/v1/users/login", methods=['POST'])
@ -73,7 +73,7 @@ def login():
@anon_protect
def blobs(namespace, package_name, digest):
reponame = repo_name(namespace, package_name)
data = appr_registry.pull_blob(reponame, digest, blob_class=Blob)
data = cnr_registry.pull_blob(reponame, digest, blob_class=Blob)
json_format = request.args.get('format', None) == 'json'
return _pull(data, json_format=json_format)
@ -89,7 +89,7 @@ def list_packages():
username = None
if user:
username = user.username
result_data = appr_registry.list_packages(namespace, package_class=Package, search=query,
result_data = cnr_registry.list_packages(namespace, package_class=Package, search=query,
media_type=media_type, username=username)
return jsonify(result_data)
@ -102,7 +102,7 @@ def list_packages():
@anon_protect
def delete_package(namespace, package_name, release, media_type):
reponame = repo_name(namespace, package_name)
result = appr_registry.delete_package(reponame, release, media_type, package_class=Package)
result = cnr_registry.delete_package(reponame, release, media_type, package_class=Package)
model.log_action('delete_tag', namespace, repo_name=package_name,
metadata={'release': release, 'mediatype': media_type})
return jsonify(result)
@ -116,7 +116,7 @@ def delete_package(namespace, package_name, release, media_type):
@anon_protect
def show_package(namespace, package_name, release, media_type):
reponame = repo_name(namespace, package_name)
result = appr_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)
@ -129,7 +129,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 = appr_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)
@ -141,7 +141,7 @@ def show_package_releases(namespace, package_name):
@anon_protect
def show_package_release_manifests(namespace, package_name, release):
reponame = repo_name(namespace, package_name)
result = appr_registry.show_package_manifests(reponame, release, package_class=Package)
result = cnr_registry.show_package_manifests(reponame, release, package_class=Package)
return jsonify(result)
@ -155,7 +155,7 @@ def show_package_release_manifests(namespace, package_name, release):
def pull(namespace, package_name, release, media_type):
reponame = repo_name(namespace, package_name)
logger.info("pull %s", reponame)
data = appr_registry.pull(reponame, release, media_type, Package, blob_class=Blob)
data = cnr_registry.pull(reponame, release, media_type, Package, blob_class=Blob)
model.log_action('pull_repo', namespace, repo_name=package_name,
metadata={'release': release, 'mediatype': media_type})
json_format = request.args.get('format', None) == 'json'
@ -199,7 +199,7 @@ def push(namespace, package_name):
force = request.args.get('force', 'false') == 'true'
blob = Blob(reponame, values['blob'])
app_release = appr_registry.push(reponame, release_version, media_type, blob, force,
app_release = cnr_registry.push(reponame, release_version, media_type, blob, force,
package_class=Package, user=owner, visibility=private)
model.log_action('push_repo', namespace, repo_name=package_name,
metadata={'release': release_version})
@ -216,7 +216,7 @@ def search_packages():
if user:
username = user.username
search_results = appr_registry.search(query, Package, username=username)
search_results = cnr_registry.search(query, Package, username=username)
return jsonify(search_results)
@ -228,7 +228,7 @@ def search_packages():
@anon_protect
def list_channels(namespace, package_name):
reponame = repo_name(namespace, package_name)
return jsonify(appr_registry.list_channels(reponame, channel_class=Channel))
return jsonify(cnr_registry.list_channels(reponame, channel_class=Channel))
@appr_bp.route(
@ -239,7 +239,7 @@ def list_channels(namespace, package_name):
@anon_protect
def show_channel(namespace, package_name, channel_name):
reponame = repo_name(namespace, package_name)
channel = appr_registry.show_channel(reponame, channel_name, channel_class=Channel)
channel = cnr_registry.show_channel(reponame, channel_name, channel_class=Channel)
return jsonify(channel)
@ -253,7 +253,7 @@ def show_channel(namespace, package_name, channel_name):
def add_channel_release(namespace, package_name, channel_name, release):
_check_channel_name(channel_name, release)
reponame = repo_name(namespace, package_name)
result = appr_registry.add_channel_release(reponame, channel_name, release, channel_class=Channel,
result = cnr_registry.add_channel_release(reponame, channel_name, release, channel_class=Channel,
package_class=Package)
model.log_action('create_tag', namespace, repo_name=package_name,
metadata={'channel': channel_name, 'release': release})
@ -284,7 +284,7 @@ def _check_channel_name(channel_name, release=None):
def delete_channel_release(namespace, package_name, channel_name, release):
_check_channel_name(channel_name, release)
reponame = repo_name(namespace, package_name)
result = appr_registry.delete_channel_release(reponame, channel_name, release,
result = cnr_registry.delete_channel_release(reponame, channel_name, release,
channel_class=Channel, package_class=Package)
model.log_action('delete_tag', namespace, repo_name=package_name,
metadata={'channel': channel_name, 'release': release})
@ -301,7 +301,7 @@ def delete_channel_release(namespace, package_name, channel_name, release):
def delete_channel(namespace, package_name, channel_name):
_check_channel_name(channel_name)
reponame = repo_name(namespace, package_name)
result = appr_registry.delete_channel(reponame, channel_name, channel_class=Channel)
result = cnr_registry.delete_channel(reponame, channel_name, channel_class=Channel)
model.log_action('delete_tag', namespace, repo_name=package_name,
metadata={'channel': channel_name})
return jsonify(result)