chore: cleanup config

Author: alukach

docker-compose.yaml

@@ -46,10 +46,8 @@ services:
     build:
       context: .
     environment:
-      STAC_AUTH_PROXY_UPSTREAM_URL: ${STAC_AUTH_PROXY_UPSTREAM_URL:-http://stac:8001}
-      STAC_AUTH_PROXY_OIDC_DISCOVERY_URL: ${STAC_AUTH_PROXY_OIDC_DISCOVERY_URL}
-    ports:
-      - "8000:8000"
+      UPSTREAM_URL: ${UPSTREAM_URL:-http://stac:8001}
+      OIDC_DISCOVERY_URL: ${OIDC_DISCOVERY_URL:-https://accounts.google.com/.well-known/openid-configuration}
     env_file:
       - path: .env
         required: false

src/stac_auth_proxy/config.py

@@ -1,13 +1,15 @@
 """Configuration for the STAC Auth Proxy."""
 
 import importlib
-from typing import Optional, Sequence, TypeAlias
+from typing import Literal, Optional, Sequence, TypeAlias
 
 from pydantic import BaseModel, Field
 from pydantic.networks import HttpUrl
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-EndpointMethods: TypeAlias = dict[str, list[str]]
+EndpointMethods: TypeAlias = dict[
+    str, list[Literal["GET", "POST", "PUT", "DELETE", "PATCH"]]
+]
 _PREFIX_PATTERN = r"^/.*$"
 
 
@@ -29,12 +31,21 @@ def __call__(self):
 class Settings(BaseSettings):
     """Configuration settings for the STAC Auth Proxy."""
 
-    upstream_url: HttpUrl = HttpUrl(url="https://earth-search.aws.element84.com/v1")
+    # External URLs
+    upstream_url: HttpUrl
     oidc_discovery_url: HttpUrl
 
     # Endpoints
     healthz_prefix: str = Field(pattern=_PREFIX_PATTERN, default="/healthz")
+    openapi_spec_endpoint: Optional[str] = Field(pattern=_PREFIX_PATTERN, default=None)
+
+    # Auth
     default_public: bool = False
+    public_endpoints: EndpointMethods = {
+        r"^/api.html$": ["GET"],
+        r"^/api$": ["GET"],
+        r"^/healthz": ["GET"],
+    }
     private_endpoints: EndpointMethods = {
         # https://github.com/stac-api-extensions/collection-transaction/blob/v1.0.0-beta.1/README.md#methods
         r"^/collections$": ["POST"],
@@ -45,18 +56,12 @@ class Settings(BaseSettings):
         # https://stac-utils.github.io/stac-fastapi/api/stac_fastapi/extensions/third_party/bulk_transactions/#bulktransactionextension
         r"^/collections/([^/]+)/bulk_items$": ["POST"],
     }
-    public_endpoints: EndpointMethods = {r"^/api.html$": ["GET"], r"^/api$": ["GET"]}
-    openapi_spec_endpoint: Optional[str] = None
-
-    # collections_filter: Optional[ClassInput] = None
-    # collections_filter_endpoints: Optional[EndpointMethods] = {
-    #     r"^/collections$": ["GET"],
-    #     r"^/collections$/([^/]+)": ["GET"],
-    # }
+
+    # Filters
     items_filter: Optional[ClassInput] = None
     items_filter_endpoints: Optional[EndpointMethods] = {
         r"^/search$": ["POST"],
         r"^/collections/([^/]+)/items$": ["GET", "POST"],
     }
 
-    model_config = SettingsConfigDict(env_prefix="STAC_AUTH_PROXY_")
+    model_config = SettingsConfigDict()

src/stac_auth_proxy/utils/requests.py

@@ -6,6 +6,8 @@
 
 from starlette.requests import Request
 
+from ..config import EndpointMethods
+
 
 def extract_variables(url: str) -> dict:
     """
@@ -24,7 +26,7 @@ def dict_to_bytes(d: dict) -> bytes:
     return json.dumps(d, separators=(",", ":")).encode("utf-8")
 
 
-def matches_route(request: Request, url_patterns: dict[str, list[str]]) -> bool:
+def matches_route(request: Request, url_patterns: EndpointMethods) -> bool:
     """
     Test if the incoming request.path and request.method match any of the patterns
     (and their methods) in url_patterns.