From bdd366fa033d19074d3dd603b0a1571d7aff9353 Mon Sep 17 00:00:00 2001 From: Patricia Fricke Date: Tue, 11 Mar 2025 16:10:39 +0000 Subject: [PATCH 1/2] fix db env vars in database.py; add ssl --- tipg/database.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tipg/database.py b/tipg/database.py index c36fd505..07d2f326 100644 --- a/tipg/database.py +++ b/tipg/database.py @@ -113,10 +113,12 @@ async def connect_to_db( con_init = connection_factory(schemas, user_sql_files, skip_sql_execution) + kwargs = {} if os.environ.get("IAM_AUTH_ENABLED") == "TRUE": kwargs["password"] = functools.partial( - get_rds_token, settings.host, settings.port, settings.user, settings.region + get_rds_token, settings.postgres_host, settings.postgres_port, settings.postgres_user, settings.aws_region ) + kwargs["ssl"] = "require" app.state.pool = await asyncpg.create_pool_b( str(settings.database_url), From 6ef9e6c39de7f571adfd56a3ad2ab8412ec50184 Mon Sep 17 00:00:00 2001 From: Patricia Fricke Date: Tue, 11 Mar 2025 16:11:12 +0000 Subject: [PATCH 2/2] format files --- tipg/database.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tipg/database.py b/tipg/database.py index 07d2f326..9f8ddaa0 100644 --- a/tipg/database.py +++ b/tipg/database.py @@ -116,7 +116,11 @@ async def connect_to_db( kwargs = {} if os.environ.get("IAM_AUTH_ENABLED") == "TRUE": kwargs["password"] = functools.partial( - get_rds_token, settings.postgres_host, settings.postgres_port, settings.postgres_user, settings.aws_region + get_rds_token, + settings.postgres_host, + settings.postgres_port, + settings.postgres_user, + settings.aws_region, ) kwargs["ssl"] = "require"