Remove Modal custom domain wiring and pin core

Author: anth-volk

changelog.d/1523.changed.md

@@ -0,0 +1 @@
+Remove Modal gateway custom-domain registration and pin `policyengine-core` to version 3.26.5 or newer.

policyengine_household_api/modal_release/gateway_app.py

@@ -19,39 +19,10 @@
     "HOUSEHOLD_MODAL_GATEWAY_WEB_ENDPOINT_LABEL",
     "household-api-gateway",
 )
-GATEWAY_CUSTOM_DOMAIN = "household.api.policyengine.org"
-
-
-def gateway_custom_domains(
-    *,
-    modal_environment: str | None = None,
-    custom_domains: str | None = None,
-) -> tuple[str, ...]:
-    if custom_domains is None:
-        custom_domains = os.getenv("HOUSEHOLD_MODAL_GATEWAY_CUSTOM_DOMAINS")
-
-    if custom_domains is not None:
-        return tuple(
-            domain.strip()
-            for domain in custom_domains.split(",")
-            if domain.strip()
-        )
-
-    environment = modal_environment or os.getenv("MODAL_ENVIRONMENT", "main")
-    if environment == "main":
-        return (GATEWAY_CUSTOM_DOMAIN,)
-
-    return ()
-
-
-GATEWAY_CUSTOM_DOMAINS = gateway_custom_domains()
 
 
 def gateway_wsgi_app_options() -> dict[str, object]:
-    options: dict[str, object] = {"label": GATEWAY_WEB_ENDPOINT_LABEL}
-    if GATEWAY_CUSTOM_DOMAINS:
-        options["custom_domains"] = GATEWAY_CUSTOM_DOMAINS
-    return options
+    return {"label": GATEWAY_WEB_ENDPOINT_LABEL}
 
 
 app = modal.App(GATEWAY_APP_NAME)

pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
     "inflect",
     "joserfc>=1.6.0",
     "modal>=1.3.0",
+    "policyengine-core>=3.26.5",
     "policyengine_canada==0.96.3",
     "policyengine-ng==0.5.1",
     "policyengine-il==0.1.0",

tests/unit/modal_release/test_gateway_app.py

@@ -4,32 +4,17 @@
 
 from policyengine_household_api.modal_release.gateway_app import (
     GATEWAY_APP_NAME,
-    GATEWAY_CUSTOM_DOMAIN,
     GATEWAY_WEB_ENDPOINT_LABEL,
-    gateway_custom_domains,
+    gateway_wsgi_app_options,
 )
 
 
 def test_gateway_web_endpoint_label_is_short_and_stable():
     assert GATEWAY_WEB_ENDPOINT_LABEL == "household-api-gateway"
 
 
-def test_gateway_custom_domain_defaults_to_main_environment_only():
-    assert gateway_custom_domains(modal_environment="main") == (
-        GATEWAY_CUSTOM_DOMAIN,
-    )
-    assert gateway_custom_domains(modal_environment="staging") == ()
-    assert gateway_custom_domains(modal_environment="testing") == ()
-
-
-def test_gateway_custom_domain_accepts_explicit_override():
-    assert gateway_custom_domains(
-        custom_domains="example.com, alt.example.com"
-    ) == (
-        "example.com",
-        "alt.example.com",
-    )
-    assert gateway_custom_domains(custom_domains="") == ()
+def test_gateway_wsgi_app_options_do_not_register_custom_domains():
+    assert gateway_wsgi_app_options() == {"label": GATEWAY_WEB_ENDPOINT_LABEL}
 
 
 def test_gateway_web_endpoint_label_fits_modal_hostname_limit():