🐛 Fix issues with parsing S3Settings (ITISFoundation#3042)

Author: GitHK

packages/settings-library/src/settings_library/r_clone.py

@@ -1,6 +1,7 @@
 from enum import Enum
 
 from pydantic import Field
+
 from .base import BaseCustomSettings
 from .s3 import S3Settings
 

packages/settings-library/src/settings_library/s3.py

@@ -1,16 +1,17 @@
 from typing import Optional
 
-from .base import BaseCustomSettings
 from pydantic import validator
 
+from .base import BaseCustomSettings
+
 
 class S3Settings(BaseCustomSettings):
+    S3_SECURE: bool = False
     S3_ENDPOINT: str
     S3_ACCESS_KEY: str
     S3_SECRET_KEY: str
     S3_ACCESS_TOKEN: Optional[str] = None
     S3_BUCKET_NAME: str
-    S3_SECURE: bool = False
     S3_REGION: str = "us-east-1"
 
     @validator("S3_ENDPOINT", pre=True)

packages/settings-library/tests/test_s3.py

@@ -0,0 +1,34 @@
+# pylint:disable=redefined-outer-name
+# pylint:disable=unused-argument
+
+import pytest
+from pytest import MonkeyPatch
+from settings_library.s3 import S3Settings
+
+
+@pytest.fixture
+def base_env(monkeypatch: MonkeyPatch) -> None:
+    monkeypatch.setenv("S3_ACCESS_KEY", "mocked")
+    monkeypatch.setenv("S3_SECRET_KEY", "mocked")
+    monkeypatch.setenv("S3_BUCKET_NAME", "mocked")
+
+
+@pytest.mark.parametrize(
+    "endpoint, secure, expected",
+    [
+        ("osparc.io", "true", "https://osparc.io"),
+        ("osparc.io", "false", "http://osparc.io"),
+        ("https://osparc.io", "true", "https://osparc.io"),
+        ("https://osparc.io", "false", "https://osparc.io"),
+        ("http://osparc.io", "true", "http://osparc.io"),
+        ("http://osparc.io", "false", "http://osparc.io"),
+    ],
+)
+def test_regression(
+    monkeypatch: MonkeyPatch, endpoint: str, secure: str, expected: str, base_env: None
+) -> None:
+    monkeypatch.setenv("S3_ENDPOINT", endpoint)
+    monkeypatch.setenv("S3_SECURE", secure)
+
+    s3_settings = S3Settings()
+    assert s3_settings.S3_ENDPOINT == expected