endpoints.v2: yapf format

This commit is contained in:
Jimmy Zelinskie 2017-06-29 13:24:00 -04:00
parent ecd5996386
commit 92e978fa0f
6 changed files with 56 additions and 70 deletions

View file

@ -9,9 +9,9 @@ from flask import request, make_response, jsonify, session
from app import authentication, userevents, metric_queue
from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token
from auth.decorators import process_auth
from auth.permissions import (ModifyRepositoryPermission, UserAdminPermission,
ReadRepositoryPermission, CreateRepositoryPermission,
repository_read_grant, repository_write_grant)
from auth.permissions import (
ModifyRepositoryPermission, UserAdminPermission, ReadRepositoryPermission,
CreateRepositoryPermission, repository_read_grant, repository_write_grant)
from auth.signedgrant import generate_signed_token
from endpoints.common import parse_repository_name
from endpoints.decorators import anon_protect, anon_allowed
@ -22,7 +22,6 @@ from util.audit import track_and_log
from util.http import abort
from util.names import REPOSITORY_NAME_REGEX
logger = logging.getLogger(__name__)
@ -66,7 +65,9 @@ def generate_headers(scope=GrantType.READ_REPOSITORY, add_grant_for_status=None)
response.headers['X-Docker-Token'] = signature
return response
return wrapper
return decorator_method
@ -122,18 +123,15 @@ def get_user():
if get_validated_oauth_token():
return jsonify({
'username': '$oauthtoken',
'email': None,
})
'email': None,})
elif get_authenticated_user():
return jsonify({
'username': get_authenticated_user().username,
'email': get_authenticated_user().email,
})
'email': get_authenticated_user().email,})
elif get_validated_token():
return jsonify({
'username': '$token',
'email': None,
})
'email': None,})
abort(404)
@ -151,8 +149,7 @@ def update_user(username):
return jsonify({
'username': get_authenticated_user().username,
'email': get_authenticated_user().email
})
'email': get_authenticated_user().email})
abort(403)
@ -181,8 +178,7 @@ def create_repository(namespace_name, repo_name):
if not modify_perm.can():
abort(403,
message='You do not have permission to modify repository %(namespace)s/%(repository)s',
issue='no-repo-write-permission',
namespace=namespace_name, repository=repo_name)
issue='no-repo-write-permission', namespace=namespace_name, repository=repo_name)
elif repo.kind != 'image':
msg = 'This repository is for managing %s resources and not container images.' % repo.kind
abort(405, message=msg, namespace=namespace_name)
@ -205,8 +201,7 @@ def create_repository(namespace_name, repo_name):
user_event_data = {
'action': 'push_start',
'repository': repo_name,
'namespace': namespace_name,
}
'namespace': namespace_name,}
event = userevents.get_event(get_authenticated_user().username)
event.publish_event_data('docker-cli', user_event_data)
@ -237,8 +232,7 @@ def update_images(namespace_name, repo_name):
updated_tags = session.get('pushed_tags', {})
event_data = {
'updated_tags': updated_tags,
}
'updated_tags': updated_tags,}
track_and_log('push_repo', repo)
spawn_notification(repo, 'repo_push', event_data)
@ -329,7 +323,7 @@ def _conduct_repo_search(username, query, limit=25, page=1):
offset = (page - 1) * limit
if query:
matching_repos = model.get_sorted_matching_repositories(query, username, limit=limit+1,
matching_repos = model.get_sorted_matching_repositories(query, username, limit=limit + 1,
offset=offset)
else:
matching_repos = []
@ -340,8 +334,7 @@ def _conduct_repo_search(username, query, limit=25, page=1):
'name': repo.namespace_name + '/' + repo.name,
'description': repo.description,
'is_public': repo.is_public,
'href': '/repository/' + repo.namespace_name + '/' + repo.name
})
'href': '/repository/' + repo.namespace_name + '/' + repo.name})
# Defined: https://docs.docker.com/v1.6/reference/api/registry_api/
return {
@ -350,5 +343,4 @@ def _conduct_repo_search(username, query, limit=25, page=1):
'num_pages': page + 1 if len(matching_repos) > limit else page,
'page': page,
'page_size': limit,
'results': results,
}
'results': results,}