diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5605c6dec37f88861fdca9244af7ba8f29fde86..86c9856ed4cbbeddfc01bf15aaa451ef96bb21aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,4 +99,4 @@ pypi: script: - python3 -m build after_script: - - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive -u __token__ -p $pypi_token dist/* + - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive --verbose -u __token__ -p $pypi_token dist/* diff --git a/dinamis_sdk/auth.py b/dinamis_sdk/auth.py index 87b6dd3c7288948dd20e90c2af0c8f2f1e74fdae..40b71407bd3f99b422d1f34967210bca2b5411ad 100644 --- a/dinamis_sdk/auth.py +++ b/dinamis_sdk/auth.py @@ -260,6 +260,7 @@ class TokenServer: session.mount("https://", adapter) session.mount("http://", adapter) self.endpoint = endpoint + log.info("Using Token Server: %s", endpoint) def get_access_token() -> str: return session.get(self.endpoint, timeout=10).json() diff --git a/dinamis_sdk/utils.py b/dinamis_sdk/utils.py index 25d8ff9becd472427550517f2939d73d878c0d34..7b990edee46cec27c19db62b6349bc54ecb8ca12 100644 --- a/dinamis_sdk/utils.py +++ b/dinamis_sdk/utils.py @@ -17,18 +17,18 @@ def _get_seconds(env_var_name: str) -> int: return None # Signed TTL margin default to 1800 seconds (30 minutes), or env. var. -ttl_margin_from_env = _get_seconds("DINAMIS_SDK_TTL_MARGIN") -log.info( - "Setting TTL margin from environment variable to %s seconds", - ttl_margin_from_env -) +if (ttl_margin_from_env := _get_seconds("DINAMIS_SDK_TTL_MARGIN")): + log.info( + "Setting TTL margin from environment variable to %s seconds", + ttl_margin_from_env + ) SIGNED_URL_TTL_MARGIN = ttl_margin_from_env or 1800 -SIGNED_URL_DURATION_SECONDS = _get_seconds("DINAMIS_SDK_DURATION_SECONDS") -log.info( - "Setting duration seconds from environment variable to %s seconds", - SIGNED_URL_DURATION_SECONDS -) +if (SIGNED_URL_DURATION_SECONDS := _get_seconds("DINAMIS_SDK_DURATION_SECONDS")): + log.info( + "Setting duration seconds from environment variable to %s seconds", + SIGNED_URL_DURATION_SECONDS + ) MAX_URLS = 64 S3_STORAGE_DOMAIN = "meso.umontpellier.fr"