removed POSTGRES_ENDPOINT

Author: sanderegg

.env-devel

@@ -193,7 +193,6 @@ PAYMENTS_USERNAME=admin
 PAYMENTS_TRACING={}
 
 POSTGRES_DB=simcoredb
-POSTGRES_ENDPOINT=postgres:5432
 POSTGRES_HOST=postgres
 POSTGRES_PASSWORD=adminadmin
 POSTGRES_PORT=5432

packages/pytest-simcore/src/pytest_simcore/postgres_service.py

@@ -250,7 +250,6 @@ def postgres_env_vars_dict(postgres_dsn: PostgresTestConfig) -> EnvVarsDict:
         "POSTGRES_DB": postgres_dsn["database"],
         "POSTGRES_HOST": postgres_dsn["host"],
         "POSTGRES_PORT": f"{postgres_dsn['port']}",
-        "POSTGRES_ENDPOINT": f"{postgres_dsn['host']}:{postgres_dsn['port']}",
     }
 
 

scripts/maintenance/computational-clusters/autoscaled_monitor/db.py

@@ -18,8 +18,11 @@ async def db_engine(
     state: AppState,
 ) -> AsyncGenerator[AsyncEngine, Any]:
     async with contextlib.AsyncExitStack() as stack:
-        assert state.environment["POSTGRES_ENDPOINT"]  # nosec
-        db_endpoint = state.environment["POSTGRES_ENDPOINT"]
+        assert state.environment["POSTGRES_HOST"]  # nosec
+        assert state.environment["POSTGRES_PORT"]  # nosec
+        db_endpoint = (
+            f"{state.environment['POSTGRES_HOST']}:{state.environment['POSTGRES_PORT']}"
+        )
         if state.main_bastion_host:
             assert state.ssh_key_path  # nosec
             db_host, db_port = db_endpoint.split(":")

services/director-v2/.env-devel

@@ -29,7 +29,6 @@ DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
 
 LOG_LEVEL=DEBUG
 
-POSTGRES_ENDPOINT=postgres:5432
 POSTGRES_USER=test
 POSTGRES_PASSWORD=test
 POSTGRES_DB=test

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py

@@ -152,7 +152,6 @@ def _get_environment_variables(
         "DYNAMIC_SIDECAR_LOG_LEVEL": app_settings.DYNAMIC_SERVICES.DYNAMIC_SIDECAR.DYNAMIC_SIDECAR_LOG_LEVEL,
         "DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED": f"{app_settings.DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED}",
         "POSTGRES_DB": f"{app_settings.POSTGRES.POSTGRES_DB}",
-        "POSTGRES_ENDPOINT": f"{app_settings.POSTGRES.POSTGRES_HOST}:{app_settings.POSTGRES.POSTGRES_PORT}",
         "POSTGRES_HOST": f"{app_settings.POSTGRES.POSTGRES_HOST}",
         "POSTGRES_PASSWORD": f"{app_settings.POSTGRES.POSTGRES_PASSWORD.get_secret_value()}",
         "POSTGRES_PORT": f"{app_settings.POSTGRES.POSTGRES_PORT}",
@@ -458,9 +457,9 @@ async def get_dynamic_sidecar_spec(  # pylint:disable=too-many-arguments# noqa:
         dynamic_sidecar_settings=dynamic_sidecar_settings, app_settings=app_settings
     )
 
-    assert scheduler_data.product_name is not None, (
-        "ONLY for legacy. This function should not be called with product_name==None"
-    )  # nosec
+    assert (
+        scheduler_data.product_name is not None
+    ), "ONLY for legacy. This function should not be called with product_name==None"  # nosec
 
     standard_simcore_docker_labels: dict[DockerLabelKey, str] = SimcoreContainerLabels(
         user_id=scheduler_data.user_id,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py

@@ -41,7 +41,6 @@
     "DYNAMIC_SIDECAR_TRACING",
     "NODE_PORTS_400_REQUEST_TIMEOUT_ATTEMPTS",
     "POSTGRES_DB",
-    "POSTGRES_ENDPOINT",
     "POSTGRES_HOST",
     "POSTGRES_PASSWORD",
     "POSTGRES_PORT",

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

@@ -71,7 +71,6 @@ def mock_env(
             "DYNAMIC_SIDECAR_IMAGE": "local/dynamic-sidecar:MOCK",
             "LOG_LEVEL": "DEBUG",
             "POSTGRES_DB": "test",
-            "POSTGRES_ENDPOINT": "localhost:5432",
             "POSTGRES_HOST": "localhost",
             "POSTGRES_PASSWORD": "test",
             "POSTGRES_PORT": "5432",
@@ -275,7 +274,6 @@ def expected_dynamic_sidecar_spec(
                     "POSTGRES_PORT": "5432",
                     "POSTGRES_USER": "test",
                     "POSTGRES_PASSWORD": "test",
-                    "POSTGRES_ENDPOINT": "localhost:5432",
                     "RABBIT_HOST": "rabbit",
                     "RABBIT_PASSWORD": "adminadmin",
                     "RABBIT_PORT": "5672",

services/web/server/tests/data/default_app_config-integration.yaml

@@ -24,7 +24,6 @@ db:
   enabled: true
   postgres:
     database: ${POSTGRES_DB}
-    endpoint: ${POSTGRES_ENDPOINT}
     host: ${POSTGRES_HOST}
     maxsize: 50
     minsize: 2