fixed issue with url parsing (ITISFoundation#3023)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

services/storage/src/simcore_service_storage/s3.py

@@ -5,8 +5,8 @@
 from typing import Dict
 
 from aiohttp import web
-from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
 from pydantic import AnyUrl, parse_obj_as
+from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
 
 from .constants import APP_CONFIG_KEY, APP_S3_KEY
 from .s3wrapper.s3_client import MinioClientWrapper
@@ -58,9 +58,10 @@ async def do_create_bucket():
 def _minio_client_endpint(s3_endpoint: str) -> str:
     # Minio client adds http and https based on the secure paramenter
     # provided at construction time, already including the schema
-    # will cause issues, encoding url to HOST:PORT
+    # will cause issues, encoding url to HOST:PORT or just HOST
+    # if port is missing
     url = parse_obj_as(AnyUrl, s3_endpoint)
-    return f"{url.host}:{url.port}"
+    return f"{url.host}" if url.port is None else f"{url.host}:{url.port}"
 
 
 def setup_s3(app: web.Application):

services/storage/tests/unit/test_route_s3_access.py

@@ -1,5 +1,4 @@
 # pylint: disable=redefined-outer-name
-# pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 

services/storage/tests/unit/test_s3.py

@@ -0,0 +1,17 @@
+# pylint: disable=protected-access
+
+import pytest
+from simcore_service_storage import s3
+
+
+@pytest.mark.parametrize(
+    "url, expected",
+    [
+        ("https://ceph.com", "ceph.com"),
+        ("http://ciao.com", "ciao.com"),
+        ("http://local.address:8012", "local.address:8012"),
+        ("https://remote.stragen.com:4432", "remote.stragen.com:4432"),
+    ],
+)
+def test_minio_client_endpint(url: str, expected: str) -> None:
+    assert s3._minio_client_endpint(url) == expected