feat!: Upgrading storages with new STORAGES. (#4674)

* feat!: Upgrading storages with STORAGES.

Author: awais786

course_discovery/apps/core/tests/test_prod_config.py

@@ -0,0 +1,44 @@
+import importlib
+import sys
+import textwrap
+
+
+def test_production_media_storage(monkeypatch, tmp_path):
+    """Test that MEDIA_STORAGE_BACKEND YAML block overrides default storage + media settings."""
+
+    # Create a temporary YAML file to act as DISCOVERY_CFG
+    fake_config = tmp_path / "config.yaml"
+    fake_yaml_content = textwrap.dedent("""
+        MEDIA_STORAGE_BACKEND:
+          AWS_S3_OBJECT_PARAMETERS:
+            CacheControl: max-age=31536
+          AWS_QUERYSTRING_AUTH: false
+          AWS_QUERYSTRING_EXPIRE: false
+          AWS_S3_CUSTOM_DOMAIN: cdn.org
+          AWS_STORAGE_BUCKET_NAME: tests
+          DEFAULT_FILE_STORAGE: storages.backends.s3boto3.S3Boto3Storage
+          MEDIA_ROOT: media
+          MEDIA_URL: https://cdn.org/media/
+    """)
+    fake_config.write_text(fake_yaml_content)
+
+    # Patch environment variable so production.py sees the config
+    monkeypatch.setenv("DISCOVERY_CFG", str(fake_config))
+
+    # Remove production module if already imported
+    sys.modules.pop("course_discovery.settings.production", None)
+    # Import production settings fresh
+    prod = importlib.import_module("course_discovery.settings.production")
+
+    # Assert MEDIA_STORAGE_BACKEND unpacked correctly
+    assert "default" in prod.STORAGES
+    assert prod.STORAGES["default"]["BACKEND"] == "storages.backends.s3boto3.S3Boto3Storage"
+    assert prod.MEDIA_URL == "https://cdn.org/media/"
+    assert prod.MEDIA_ROOT == "media"
+
+    # Assert all AWS keys are present
+    assert prod.AWS_STORAGE_BUCKET_NAME == "tests"
+    assert prod.AWS_S3_CUSTOM_DOMAIN == "cdn.org"
+    assert prod.AWS_QUERYSTRING_AUTH is False
+    assert prod.AWS_QUERYSTRING_EXPIRE is False
+    assert prod.AWS_S3_OBJECT_PARAMETERS == {"CacheControl": "max-age=31536"}

course_discovery/settings/base.py

@@ -580,7 +580,18 @@
 EMAIL_USE_TLS = False
 EXTRA_APPS = []
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage"
+
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"
+,
+    },
+}
+
+
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
@@ -591,7 +602,7 @@
 }
 API_ROOT = None
 MEDIA_STORAGE_BACKEND = {
-    'DEFAULT_FILE_STORAGE': 'django.core.files.storage.FileSystemStorage',
+    "STORAGES": STORAGES,
     'MEDIA_ROOT': MEDIA_ROOT,
     'MEDIA_URL': MEDIA_URL
 }

course_discovery/settings/production.py

@@ -41,6 +41,16 @@
 
     vars().update(config_from_yaml)
 
+    MEDIA_STORAGE_BACKEND = config_from_yaml.get("MEDIA_STORAGE_BACKEND", {})
+    default_backend = MEDIA_STORAGE_BACKEND.pop("DEFAULT_FILE_STORAGE", None)
+    static_backend = MEDIA_STORAGE_BACKEND.pop("STATICFILES_STORAGE", None)
+
+    if default_backend:
+        STORAGES["default"]["BACKEND"] = default_backend
+
+    if static_backend:
+        STORAGES["staticfiles"]["BACKEND"] = static_backend
+
     # Unpack media storage settings.
     # It's important we unpack here because of https://github.com/openedx/configuration/pull/3307
     vars().update(MEDIA_STORAGE_BACKEND)