[Downmerge] Handle missing broker port value

usaspending_api/config/envs/default.py

@@ -87,15 +87,15 @@ def __new__(cls, *args, **kwargs):
     USASPENDING_DB_HOST: str = ENV_SPECIFIC_OVERRIDE
     USASPENDING_DB_PORT: str = ENV_SPECIFIC_OVERRIDE
 
-    BROKER_DB: str = (
+    BROKER_DB: str | None = (
         None  # FACTORY_PROVIDED_VALUE. See its root validator-factory below
     )
-    BROKER_DB_SCHEME: str = "postgres"
-    BROKER_DB_NAME: str = "data_broker"
-    BROKER_DB_USER: str = ENV_SPECIFIC_OVERRIDE
-    BROKER_DB_PASSWORD: SecretStr = ENV_SPECIFIC_OVERRIDE
-    BROKER_DB_HOST: str = ENV_SPECIFIC_OVERRIDE
-    BROKER_DB_PORT: str = ENV_SPECIFIC_OVERRIDE
+    BROKER_DB_SCHEME: str | None = "postgres"
+    BROKER_DB_NAME: str | None = "data_broker"
+    BROKER_DB_USER: str | None = ENV_SPECIFIC_OVERRIDE
+    BROKER_DB_PASSWORD: SecretStr | None = ENV_SPECIFIC_OVERRIDE
+    BROKER_DB_HOST: str | None = ENV_SPECIFIC_OVERRIDE
+    BROKER_DB_PORT: str | None = ENV_SPECIFIC_OVERRIDE
 
     # noinspection PyMethodParameters
     # Pydantic returns a classmethod for its validators, so the cls param is correct

usaspending_api/config/envs/local.py

@@ -51,13 +51,13 @@ class LocalConfig(DefaultConfig):
     USASPENDING_DB_PORT: str = "5432"
 
     # ==== [Postgres Broker] ====
-    BROKER_DB_USER: str = "admin"
-    BROKER_DB_PASSWORD: SecretStr = "root"
+    BROKER_DB_USER: str | None = "admin"
+    BROKER_DB_PASSWORD: SecretStr | None = "root"
 
     # Change to host.docker.internal if you are running a local Postgres. Otherwise leave as-is, so
     # Docker will use the Postgres created by Compose.
-    BROKER_DB_HOST: str = "dataact-broker-db"
-    BROKER_DB_PORT: str = "5432"
+    BROKER_DB_HOST: str | None = "dataact-broker-db"
+    BROKER_DB_PORT: str | None = "5432"
 
     # ==== [Elasticsearch] ====
     # Where to connect to elasticsearch.