opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drop API key from more places

Browse Source
This commit is contained in:
mvdbeek
2022-02-09 17:38:10 +01:00
parent db6e2db4dc
commit 96d89a4f5c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy_test/api/test_histories.py
+1 -1
View File
@@ -390,7 +390,7 @@ class ImportExportTests(BaseHistories):
self.dataset_populator.wait_for_history(history_id, assert_ok=assert_ok)
return self.dataset_populator.reimport_history(
history_id, history_name, wait_on_history_length=wait_on_history_length, export_kwds=export_kwds, api_key=self.galaxy_interactor.api_key
history_id, history_name, wait_on_history_length=wait_on_history_length, export_kwds=export_kwds,
)
def _import_history_and_wait(self, import_data, history_name, wait_on_history_length=None):
lib/galaxy_test/api/test_workflow_extraction.py
+1 -1
View File
@@ -499,7 +499,7 @@ test_data:
history_length = self.dataset_populator.history_length(history_id)
new_history_id = self.dataset_populator.reimport_history(
history_id, history_name, wait_on_history_length=history_length, export_kwds={}, api_key=self.galaxy_interactor.api_key
history_id, history_name, wait_on_history_length=history_length, export_kwds={},
)
# wait a little more for those jobs, todo fix to wait for history imported false or
# for a specific number of jobs...
lib/galaxy_test/base/populators.py
+6 -7
View File
@@ -972,20 +972,19 @@ class BaseDatasetPopulator(BasePopulator):
assert "job_id" in job_desc
return self.wait_for_job(job_desc["job_id"])
def export_url(self, history_id: str, data, api_key: str, check_download: bool = True) -> str:
def export_url(self, history_id: str, data, check_download: bool = True) -> str:
put_response = self.prepare_export(history_id, data)
response = put_response.json()
api_asserts.assert_has_keys(response, "download_url")
download_url = urllib.parse.urljoin(self.galaxy_interactor.api_url, response["download_url"].strip('/'))
if check_download:
self.get_export_url(download_url, api_key)
self.get_export_url(download_url)
return download_url
def get_export_url(self, export_url, api_key) -> Response:
full_download_url = f"{export_url}?key={api_key}"
download_response = self._get(full_download_url)
def get_export_url(self, export_url) -> Response:
download_response = self._get(export_url)
api_asserts.assert_status_code_is(download_response, 200)
return download_response
@@ -1041,11 +1040,11 @@ class BaseDatasetPopulator(BasePopulator):
contents = contents_response.json()
return len(contents)
def reimport_history(self, history_id, history_name, wait_on_history_length, export_kwds, api_key):
def reimport_history(self, history_id, history_name, wait_on_history_length, export_kwds):
# Make history public so we can import by url
self.make_public(history_id)
# Export the history.
download_url = self.export_url(history_id, export_kwds, api_key, check_download=True)
download_url = self.export_url(history_id, export_kwds, check_download=True)
import_data = dict(archive_source=download_url, archive_type="url")