From 4aaf60ae389508e00edf8165daededfde9ea6b18 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 1 May 2024 22:05:32 -0400 Subject: [PATCH] use API URL from within Docker network --- wis2-gdc-management/wis2_gdc/archive.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/wis2-gdc-management/wis2_gdc/archive.py b/wis2-gdc-management/wis2_gdc/archive.py index 1078396..e0440d0 100644 --- a/wis2-gdc-management/wis2_gdc/archive.py +++ b/wis2-gdc-management/wis2_gdc/archive.py @@ -35,11 +35,10 @@ LOGGER = logging.getLogger(__name__) -def archive_metadata(url: str, archive_zipfile: str) -> None: +def archive_metadata(archive_zipfile: str) -> None: """ Archive all discovery metadata from a GDC to an archive zipfile - :param url: `str` of GDC API URL :param archive_zipfile: `str` of filename of zipfile :returns: `None` @@ -61,7 +60,7 @@ def _get_next_link(links) -> Union[str, None]: return None end = False - gdc_items_url = f'{url}/collections/wis2-discovery-metadata/items' + gdc_items_url = f'{API_URL_DOCKER}/collections/wis2-discovery-metadata/items' # noqa response = None with zipfile.ZipFile(archive_zipfile, 'w') as zf: @@ -71,6 +70,8 @@ def _get_next_link(links) -> Union[str, None]: else: gdc_items_url2 = _get_next_link(response['links']) + LOGGER.info('Replacing with Docker internal hostname') + gdc_items_url2 = gdc_items_url2.replace(API_URL, API_URL_DOCKER) LOGGER.info(f'Querying GDC with {gdc_items_url2}') response = requests.get(gdc_items_url2).json() @@ -99,5 +100,5 @@ def _get_next_link(links) -> Union[str, None]: def archive(ctx, archive_zipfile, verbosity='NOTSET'): """Archive discovery metadata records""" - click.echo(f'Achiving metadata from GDC {API_URL}') - archive_metadata(API_URL_DOCKER, archive_zipfile) + click.echo(f'Archiving metadata from GDC {API_URL}') + archive_metadata(archive_zipfile)