set the storage backend properly to S3 if necessary for Django 5 (#3129)

Author: gumaerc

main/settings.py

@@ -13,6 +13,7 @@
 import cssutils
 import dj_database_url
 from celery.schedules import crontab
+from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 from mitol.apigateway.settings import *  # noqa: F403  # noqa: F403
 from mitol.common.envs import (
@@ -832,7 +833,9 @@
 if MITX_ONLINE_USE_S3:
     if CLOUDFRONT_DIST:
         AWS_S3_CUSTOM_DOMAIN = f"{CLOUDFRONT_DIST}.cloudfront.net"
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    # Override default storage backend to use S3 (Django 5.0+)
+    STORAGES = global_settings.STORAGES.copy()
+    STORAGES["default"]["BACKEND"] = "storages.backends.s3boto3.S3Boto3Storage"
 
 FEATURES_DEFAULT = get_bool(
     name="FEATURES_DEFAULT",

main/settings_test.py

@@ -57,7 +57,7 @@ def test_s3_settings(settings_sandbox):
     # Unset, we don't do S3
     settings_vars = settings_sandbox.patch({"MITX_ONLINE_USE_S3": "False"})
 
-    assert settings_vars.get("DEFAULT_FILE_STORAGE") is None
+    assert settings_vars.get("STORAGES", {}).get("default", {}).get("BACKEND") is None
 
     with pytest.raises(ImproperlyConfigured):
         settings_sandbox.patch({"MITX_ONLINE_USE_S3": "True"})
@@ -72,7 +72,7 @@ def test_s3_settings(settings_sandbox):
         }
     )
     assert (
-        settings_vars.get("DEFAULT_FILE_STORAGE")
+        settings_vars.get("STORAGES", {}).get("default", {}).get("BACKEND")
         == "storages.backends.s3boto3.S3Boto3Storage"
     )