server settings

Author: pcrespov

packages/service-library/src/servicelib/db_asyncpg_utils.py

@@ -26,13 +26,17 @@ async def create_async_engine_and_pg_database_ready(
     - waits until db data is migrated (i.e. ready to use)
     - returns engine
     """
+    server_settings = None
+    if settings.POSTGRES_CLIENT_NAME:
+        server_settings = {
+            "application_name": settings.POSTGRES_CLIENT_NAME,
+        }
+
     engine: AsyncEngine = create_async_engine(
         settings.dsn_with_async_sqlalchemy,
         pool_size=settings.POSTGRES_MINSIZE,
         max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
-        connect_args={
-            "server_settings": {"application_name": settings.POSTGRES_CLIENT_NAME}
-        },
+        connect_args={"server_settings": server_settings},
         pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
         future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
     )

services/web/server/tests/unit/with_dbs/01/test_db.py

@@ -29,6 +29,7 @@
 
 @pytest.fixture
 def mock_asyncpg_in_setup_db(mocker: MockFixture) -> MockType:
+
     original_setup = setup_db
 
     mock_setup_db = mocker.patch(

services/web/server/tests/unit/with_dbs/conftest.py

@@ -41,6 +41,7 @@
 from pydantic import ByteSize, parse_obj_as
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.dict_tools import ConfigDict
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem
@@ -125,6 +126,7 @@ def app_cfg(default_app_cfg: ConfigDict, unused_tcp_port_factory) -> ConfigDict:
 
 @pytest.fixture
 def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
     app_cfg: ConfigDict,
     monkeypatch_setenv_from_app_config: Callable[[ConfigDict], dict[str, str]],
 ) -> EnvVarsDict:
@@ -140,7 +142,14 @@ def app_environment(app_environment: dict[str, str], monkeypatch: pytest.MonkeyP
     """
     print("+ web_server:")
     cfg = deepcopy(app_cfg)
-    return monkeypatch_setenv_from_app_config(cfg)
+    envs = monkeypatch_setenv_from_app_config(cfg)
+
+    #
+    # NOTE: this emulates hostname: "wb-{{.Node.Hostname}}-{{.Task.Slot}}" in docker-compose that
+    # affects PostgresSettings.POSTGRES_CLIENT_NAME
+    #
+    extra = setenvs_from_dict(monkeypatch, {"HOSTNAME": "wb-test_host.0"})
+    return envs | extra
 
 
 @pytest.fixture