fix: address review comments

Author: mubbsharanwar

credentials/settings/base.py

@@ -457,8 +457,12 @@
 EXTRA_APPS = []
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 STORAGES = {
-    "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
-    "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"},
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
 }
 CACHES = {
     "default": {

credentials/settings/devstack.py

@@ -43,12 +43,16 @@
 EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
 EMAIL_FILE_PATH = "/tmp/credentials-emails"
 
-STORAGES["default"]["BACKEND"] = os.environ.get(
-    STORAGES["default"]["BACKEND"], "django.core.files.storage.FileSystemStorage"
-)
-MEDIA_URL = os.environ.get("MEDIA_URL", "/media/")
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}
 
-STORAGES["staticfiles"]["BACKEND"] = "django.contrib.staticfiles.storage.StaticFilesStorage"
+MEDIA_URL = os.environ.get("MEDIA_URL", "/media/")
 STATIC_URL = os.environ.get("STATIC_URL", "/static/")
 
 # OAuth2 variables specific to social-auth/SSO login use case.

credentials/settings/production.py

@@ -23,6 +23,8 @@
 # be here as a default.
 FILE_STORAGE_BACKEND = {}
 
+STORAGES = {}
+
 EMAIL_BACKEND = "django_ses.SESBackend"
 AWS_SES_REGION_NAME = environ.get("AWS_SES_REGION_NAME", "us-east-1")
 AWS_SES_REGION_ENDPOINT = environ.get("AWS_SES_REGION_ENDPOINT", "email.us-east-1.amazonaws.com")
@@ -43,20 +45,33 @@
             vars()[key].update(value)
 
     if "DEFAULT_FILE_STORAGE" in config_from_yaml:
-        STORAGES["default"] = {"BACKEND": config_from_yaml.pop("DEFAULT_FILE_STORAGE")}
-        vars().update(STORAGES)
+        STORAGES.update({
+            "default": {
+                "BACKEND": config_from_yaml.pop("DEFAULT_FILE_STORAGE"),
+            }
+        })
 
     if "STATICFILES_STORAGE" in config_from_yaml:
-        STORAGES["staticfiles"] = {"BACKEND": config_from_yaml.pop("STATICFILES_STORAGE")}
-        vars().update(STORAGES)
+        STORAGES.update({
+            "staticfiles": {
+                "BACKEND": config_from_yaml.pop("STATICFILES_STORAGE"),
+            }
+        })
 
     vars().update(config_from_yaml)
 
-    if "DEFAULT_FILE_STORAGE" in FILE_STORAGE_BACKEND:
-        FILE_STORAGE_BACKEND["STORAGES"] = {"default": {"BACKEND": FILE_STORAGE_BACKEND.pop("DEFAULT_FILE_STORAGE")}}
-
     # Load the files storage backend settings for django storages
-    vars().update(FILE_STORAGE_BACKEND)
+    if "DEFAULT_FILE_STORAGE" in FILE_STORAGE_BACKEND:
+        default_file_storage = FILE_STORAGE_BACKEND.pop("DEFAULT_FILE_STORAGE")
+        vars().update(FILE_STORAGE_BACKEND)
+
+        FILE_STORAGE_BACKEND.update({
+            "STORAGES": {
+                "default": {"BACKEND": default_file_storage},
+            }
+        })
+    else:
+        vars().update(FILE_STORAGE_BACKEND)
 
 # make sure this happens after the configuration file overrides so format string can be overridden
 LOGGING = get_logger_config(format_string=LOGGING_FORMAT_STRING)

credentials/settings/test.py

@@ -35,9 +35,16 @@
 
 # Local Directories
 TEST_ROOT = path("test_root")
-STORAGES["default"]["BACKEND"] = os.environ.get(
-    STORAGES["default"]["BACKEND"], "django.core.files.storage.FileSystemStorage"
-)
+
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}
+
 MEDIA_ROOT = str(TEST_ROOT / "uploads")
 MEDIA_URL = "/static/uploads/"
 
@@ -51,7 +58,6 @@
         "JWT_AUDIENCE": SOCIAL_AUTH_EDX_OAUTH2_KEY,
     }
 )
-STORAGES["staticfiles"]["BACKEND"] = "django.contrib.staticfiles.storage.StaticFilesStorage"
 
 # Verifiable Credentials
 ENABLE_VERIFIABLE_CREDENTIALS = True

credentials/tests/test_production.py

@@ -6,7 +6,7 @@
 
 
 def test_production_storage_from_yaml(monkeypatch):
-    """Test that YAML config correctly populates STORAGES and FILE_STORAGE_BACKEND."""
+    """Test that YAML config correctly populates STORAGES without leaking globals."""
 
     def fake_get_env_setting(key):
         if key == "CREDENTIALS_CFG":