From 9130689e080f54107b71a071bdf3a27ebccab476 Mon Sep 17 00:00:00 2001 From: Haresh Kainth Date: Fri, 13 Dec 2024 14:07:16 +0000 Subject: [PATCH] refactor:database settings for dynamic credential handling Revised database configuration to retrieve credentials dynamically via `DATABASE_CREDENTIALS` from environment variables. Removed fallback to SQLite and deprecated `DATABASE_URL` usage. Added a debug statement to log database credentials for validation during setup. --- fbr/settings.py | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/fbr/settings.py b/fbr/settings.py index 13278ee..5b78588 100644 --- a/fbr/settings.py +++ b/fbr/settings.py @@ -20,7 +20,6 @@ import dj_database_url import environ -from dbt_copilot_python.database import database_url_from_env from django_log_formatter_asim import ASIMFormatter # Define the root directory (i.e. ) @@ -109,30 +108,36 @@ WSGI_APPLICATION = "fbr.wsgi.application" -DATABASES: dict = {} +# if DATABASE_URL := env("DATABASE_URL", default=None): +# DATABASES = { +# "default": { +# **dj_database_url.parse( +# DATABASE_URL, +# engine="postgresql", +# ), +# "ENGINE": "django.db.backends.postgresql", +# } +# } +# else: +# DATABASES = { +# "default": { +# "ENGINE": "django.db.backends.sqlite3", +# "NAME": BASE_DIR / "db.sqlite3", +# } +# } +# Print to console DATABASE_CREDENTIALS +print(f"DATABASE_CREDENTIALS: {os.environ.get('DATABASE_CREDENTIALS')}") -if DATABASE_URL := env("DATABASE_URL", default=None): - DATABASES = { - "default": { - **dj_database_url.parse( - DATABASE_URL, - engine="postgresql", - ), - "ENGINE": "django.db.backends.postgresql", - } - } -else: - DATABASES = { - "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", - } +DATABASES = { + "default": { + **dj_database_url.parse( + os.environ.get("DATABASE_CREDENTIALS"), + engine="postgresql", + ), + "ENGINE": "django.db.backends.postgresql", } - -DATABASES["default"] = dj_database_url.config( # noqa - default=database_url_from_env("DATABASE_CREDENTIALS") -) +} AUTH_PASSWORD_VALIDATORS = [ {