archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Remove use of URLER service, replaced it with direct MongoDB query.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-01-30 18:20:15 +01:00
parent 20d80dee61
commit 27153bd74a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pillar/web/nodes/finders.py
View File

@ -2,13 +2,15 @@
import logging import logging
from flask import current_app, url_for import bson
from flask import url_for
import werkzeug.exceptions as wz_exceptions import werkzeug.exceptions as wz_exceptions
import pillarsdk import pillarsdk
from pillarsdk import Node from pillarsdk import Node
from pillarsdk.exceptions import ResourceNotFound from pillarsdk.exceptions import ResourceNotFound
from pillar import current_app
from pillar.web.utils import caching from pillar.web.utils import caching
from pillar.web import system_util from pillar.web import system_util
@ -109,29 +111,26 @@ def find_for_other(project, node):
@caching.cache_for_request() @caching.cache_for_request()
def project_url(project_id, project): def project_url(project_id: str, project: pillarsdk.Project=None) -> pillarsdk.Project:
"""Returns the project, raising a ValueError if it can't be found. """Returns the project, raising a ValueError if it can't be found.
Uses the "urler" service endpoint. Uses a direct MongoDB query to allow calls by any user. Only returns
a partial project with the _id and url properties set.
""" """
if project is not None: if project is not None:
return project return project
if not current_app.config['URLER_SERVICE_AUTH_TOKEN']: proj_coll = current_app.db('projects')
log.error('No URLER_SERVICE_AUTH_TOKEN token, unable to use URLer service.') proj = proj_coll.find_one({'_id': bson.ObjectId(project_id)},
return None {'url': 1})
urler_api = system_util.pillar_api( if proj is None:
token=current_app.config['URLER_SERVICE_AUTH_TOKEN']) log.error('project_url(%s): project does not exist, cannot find its URL', project_id)
try:
return pillarsdk.Project.find_from_endpoint(
'/service/urler/%s' % project_id, api=urler_api)
except pillarsdk.ForbiddenAccess as ex:
log.error('URLER request to find URL for project %s failed: %s', project_id, ex)
raise wz_exceptions.NotFound() raise wz_exceptions.NotFound()
return pillarsdk.Project(proj)
# Cache the actual URL based on the node ID, for the duration of the request. # Cache the actual URL based on the node ID, for the duration of the request.
@caching.cache_for_request() @caching.cache_for_request()