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

Fix url_for for api endpoints.

Browse source
This commit is contained in:
jakedt 2014-03-17 15:23:49 -04:00
parent 535947a06d
commit bb2767ff16
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
endpoints/api/__init__.py
View file

@ -21,7 +21,8 @@ from auth.auth import process_oauth
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
api_bp = Blueprint('api', __name__) api_bp = Blueprint('api', __name__)
api = Api(api_bp) api = Api()
api.init_app(api_bp)
api.decorators = [process_oauth, api.decorators = [process_oauth,
crossdomain(origin='*', headers=['Authorization', 'Content-Type'])] crossdomain(origin='*', headers=['Authorization', 'Content-Type'])]

11
endpoints/api/build.py
View file

@ -1,13 +1,13 @@
import logging import logging
import json import json
from flask import request, url_for from flask import request
from flask.ext.restful import abort from flask.ext.restful import abort
from app import app from app import app
from endpoints.api import (RepositoryParamResource, parse_args, query_param, nickname, resource, from endpoints.api import (RepositoryParamResource, parse_args, query_param, nickname, resource,
require_repo_read, require_repo_write, validate_json_request, require_repo_read, require_repo_write, validate_json_request,
ApiResource, internal_only, format_date) ApiResource, internal_only, format_date, api)
from endpoints.common import start_build from endpoints.common import start_build
from endpoints.trigger import BuildTrigger from endpoints.trigger import BuildTrigger
from data import model from data import model
@ -117,14 +117,13 @@ class RepositoryBuildList(RepositoryParamResource):
repo = model.get_repository(namespace, repository) repo = model.get_repository(namespace, repository)
display_name = user_files.get_file_checksum(dockerfile_id) display_name = user_files.get_file_checksum(dockerfile_id)
build_request = start_build(repo, dockerfile_id, ['latest'], display_name, build_request = start_build(repo, dockerfile_id, ['latest'], display_name, subdir, True)
subdir, True)
resp = build_status_view(build_request, True) resp = build_status_view(build_request, True)
repo_string = '%s/%s' % (namespace, repository) repo_string = '%s/%s' % (namespace, repository)
headers = { headers = {
'Location': url_for('api_bp.get_repo_build_status', repository=repo_string, 'Location': api.url_for(RepositoryBuildStatus, repository=repo_string,
build_uuid=build_request.uuid), build_uuid=build_request.uuid),
} }
return resp, 201, headers return resp, 201, headers

8
endpoints/api/trigger.py
View file

@ -9,8 +9,8 @@ from urlparse import urlunparse
from app import app from app import app
from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin, from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin,
log_action, request_error, query_param, parse_args, log_action, request_error, query_param, parse_args,
validate_json_request) validate_json_request, api)
from endpoints.api.build import build_status_view, trigger_view from endpoints.api.build import build_status_view, trigger_view, RepositoryBuildStatus
from endpoints.common import start_build from endpoints.common import start_build
from endpoints.trigger import (BuildTrigger, TriggerDeactivationException, from endpoints.trigger import (BuildTrigger, TriggerDeactivationException,
TriggerActivationException, EmptyRepositoryException) TriggerActivationException, EmptyRepositoryException)
@ -220,8 +220,8 @@ class ActivateBuildTrigger(RepositoryParamResource):
resp = build_status_view(build_request, True) resp = build_status_view(build_request, True)
repo_string = '%s/%s' % (namespace, repository) repo_string = '%s/%s' % (namespace, repository)
headers = { headers = {
'Location': url_for('api_bp.get_repo_build_status', repository=repo_string, 'Location': api.url_for(RepositoryBuildStatus, repository=repo_string,
build_uuid=build_request.uuid), build_uuid=build_request.uuid),
} }
return resp, 201, headers return resp, 201, headers

7
endpoints/api/webhook.py
View file

@ -1,10 +1,10 @@
import json import json
from flask import request, url_for from flask import request
from flask.ext.restful import abort from flask.ext.restful import abort
from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin, from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin,
log_action, validate_json_request) log_action, validate_json_request, api)
from data import model from data import model
@ -36,8 +36,7 @@ class WebhookList(RepositoryParamResource):
resp = webhook_view(webhook) resp = webhook_view(webhook)
repo_string = '%s/%s' % (namespace, repository) repo_string = '%s/%s' % (namespace, repository)
headers = { headers = {
'Location': url_for('api_bp.get_webhook', repository=repo_string, 'Location': api.url_for(Webhook, repository=repo_string, public_id=webhook.public_id),
public_id=webhook.public_id),
} }
log_action('add_repo_webhook', namespace, log_action('add_repo_webhook', namespace,
{'repo': repository, 'webhook_id': webhook.public_id}, {'repo': repository, 'webhook_id': webhook.public_id},