feat: add json parsing, more values

Author: gadomski

stac_fastapi/pgstac/config.py

@@ -1,5 +1,6 @@
 """Postgres API configuration."""
 
+import json
 import warnings
 from typing import Annotated, Any, List, Optional, Sequence, Type
 from urllib.parse import quote_plus as quote
@@ -158,8 +159,12 @@ def connection_string(self):
 
 def str_to_list(value: Any) -> Any:
     if isinstance(value, str):
-        return [v.strip() for v in value.split(",")]
-    return value
+        if value.startswith("["):
+            return json.loads(value)
+        else:
+            return [v.strip() for v in value.split(",")]
+    else:
+        return value
 
 
 class Settings(ApiSettings):
@@ -205,13 +210,13 @@ class Settings(ApiSettings):
         "*",
     )
     cors_origin_regex: Optional[str] = None
-    cors_methods: Annotated[Sequence[str], BeforeValidator(str_to_list)] = (
+    cors_methods: Annotated[Sequence[str], BeforeValidator(str_to_list), NoDecode] = (
         "GET",
         "POST",
         "OPTIONS",
     )
     cors_credentials: bool = False
-    cors_headers: Annotated[Sequence[str], BeforeValidator(str_to_list)] = (
+    cors_headers: Annotated[Sequence[str], BeforeValidator(str_to_list), NoDecode] = (
         "Content-Type",
     )
 

tests/test_config.py

@@ -77,12 +77,58 @@ async def test_pg_settings_attributes(monkeypatch):
             )
 
 
-def test_cors_origins(monkeypatch: MonkeyPatch) -> None:
+@pytest.mark.parametrize(
+    "cors_origins",
+    [
+        "http://stac-fastapi-pgstac.test,http://stac-fastapi.test",
+        '["http://stac-fastapi-pgstac.test","http://stac-fastapi.test"]',
+    ],
+)
+def test_cors_origins(monkeypatch: MonkeyPatch, cors_origins: str) -> None:
     monkeypatch.setenv(
-        "CORS_ORIGINS", "http://stac-fastapi-pgstac.test,http://stac-fastapi.test"
+        "CORS_ORIGINS",
+        cors_origins,
     )
     settings = Settings()
     assert settings.cors_origins == [
         "http://stac-fastapi-pgstac.test",
         "http://stac-fastapi.test",
     ]
+
+
+@pytest.mark.parametrize(
+    "cors_methods",
+    [
+        "GET,POST",
+        '["GET","POST"]',
+    ],
+)
+def test_cors_methods(monkeypatch: MonkeyPatch, cors_methods: str) -> None:
+    monkeypatch.setenv(
+        "CORS_METHODS",
+        cors_methods,
+    )
+    settings = Settings()
+    assert settings.cors_methods == [
+        "GET",
+        "POST",
+    ]
+
+
+@pytest.mark.parametrize(
+    "cors_headers",
+    [
+        "Content-Type,X-Foo",
+        '["Content-Type","X-Foo"]',
+    ],
+)
+def test_cors_headers(monkeypatch: MonkeyPatch, cors_headers: str) -> None:
+    monkeypatch.setenv(
+        "CORS_HEADERS",
+        cors_headers,
+    )
+    settings = Settings()
+    assert settings.cors_headers == [
+        "Content-Type",
+        "X-Foo",
+    ]