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

Build job does not have a request context when calling get_file_url

Browse source 
We therefore need to specify some sort of IP or get_file_url will attempt to get it from context
This commit is contained in:
Joseph Schorr 2017-10-05 15:20:16 -04:00
parent 3bef21253d
commit 2ce4e49711
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
endpoints/api/build.py
View file

@ -151,7 +151,8 @@ def build_status_view(build_obj):
if can_write or features.READER_BUILD_LOGS:
if build_obj.resource_key is not None:
resp['archive_url'] = user_files.get_file_url(build_obj.resource_key, requires_cors=True)
resp['archive_url'] = user_files.get_file_url(build_obj.resource_key,
request.remote_addr, requires_cors=True)
elif job_config.get('archive_url', None):
resp['archive_url'] = job_config['archive_url']
@ -402,7 +403,7 @@ def get_logs_or_log_url(build):
# If the logs have been archived, just return a URL of the completed archive
if build.logs_archived:
return {
'logs_url': log_archive.get_file_url(build.uuid, requires_cors=True)
'logs_url': log_archive.get_file_url(build.uuid, request.remote_addr, requires_cors=True)
}
start = int(request.args.get('start', 0))

5
endpoints/api/superuser_models_pre_oci.py
View file

@ -1,4 +1,7 @@
import features
from flask import request
from app import all_queues, userfiles
from auth.permissions import ReadRepositoryPermission, ModifyRepositoryPermission, AdministerRepositoryPermission
from data import model, database
@ -85,7 +88,7 @@ class PreOCIModel(SuperuserDataInterface):
can_admin = AdministerRepositoryPermission(repo_namespace, repo_name).can()
job_config = get_job_config(build.job_config)
phase, status, error = _get_build_status(build)
url = userfiles.get_file_url(self.resource_key, requires_cors=True)
url = userfiles.get_file_url(self.resource_key, request.remote_addr, requires_cors=True)
return RepositoryBuild(build.uuid, build.logs_archived, repo_namespace, repo_name, can_write, can_read,
_create_user(build.pull_robot), build.resource_key,