Merge pull request #126 from uktrade/feature/celery-deploy-fix

refactor:database settings for dynamic credential handling
uktrade · Dec 13, 2024 · f82ec7f · f82ec7f
2 parents d64915b + 9130689
commit f82ec7f
Showing 1 changed file with 27 additions and 22 deletions.
diff --git 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. <repo-root>)
@@ -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 = [
     {