fix: update resolve_storage_backend function and fix tests

Author: dwong2708

common/djangoapps/util/storage.py

@@ -1,6 +1,6 @@
 """ Utility functions related to django storages """
 
-from typing import Optional
+from typing import Optional, List
 from django.conf import settings
 from django.core.files.storage import storages
 from django.utils.module_loading import import_string
@@ -9,15 +9,16 @@
 def resolve_storage_backend(
         storage_key: str,
         legacy_setting_key: str,
-        legacy_sec_setting_key: str = None,
+        legacy_sec_setting_keys: List[str] = None,
         options: Optional[dict] = None):
     """
     Configures and returns a Django `Storage` instance, compatible with both Django 4 and Django 5.
     Params:
         storage_key = The key name saved in Django storages settings.
         legacy_setting_key = The key name saved in Django settings.
-        legacy_sec_setting_key = For legacy dict settings like settings.BLOCK_STRUCTURES_SETTINGS.get('STORAGE_CLASS'),
-            it is necessary to access a second-level key to retrieve the class path.
+        legacy_sec_setting_keys = List of keys to get the storage class.
+            For legacy dict settings like settings.BLOCK_STRUCTURES_SETTINGS.get('STORAGE_CLASS'),
+            it is necessary to access a second-level key or above to retrieve the class path.
         legacy_options = Kwargs for the storage class.
         options = Kwargs for the storage class.
     Returns:
@@ -32,9 +33,10 @@ def resolve_storage_backend(
     """
 
     storage_path = getattr(settings, legacy_setting_key, None)
-    if legacy_sec_setting_key and isinstance(storage_path, dict):
-        # For legacy dict settings like CUSTOM_STORAGE = {"BACKEND": "cms.custom.."}
-        storage_path = storage_path.get(legacy_sec_setting_key)
+    if isinstance(storage_path, dict) and legacy_sec_setting_keys:
+        for deep_setting_key in legacy_sec_setting_keys:
+            # For legacy dict settings like settings.CUSTOM_STORAGE = {"BACKEND": "cms.custom.."}
+            storage_path = storage_path.get(deep_setting_key)
     storages_config = getattr(settings, 'STORAGES', {})
 
     if options is None:

lms/djangoapps/verify_student/models.py

@@ -914,7 +914,6 @@ def _storage(self):
         config = settings.VERIFY_STUDENT["SOFTWARE_SECURE"]
 
         # Default to the S3 backend for backward compatibility
-        storage_class = config.get("STORAGE_CLASS", "storages.backends.s3boto3.S3Boto3Storage")
         storage_kwargs = config.get("STORAGE_KWARGS", {})
 
         # Map old settings to the parameters expected by the storage backend
@@ -927,9 +926,9 @@ def _storage(self):
             storage_kwargs["querystring_expire"] = self.IMAGE_LINK_DURATION
 
         return resolve_storage_backend(
-            storage_key="software_secure",
-            legacy_setting_key="SOFTWARE_SECURE",
-            legacy_sec_setting_key="STORAGE_CLASS",
+            storage_key="verify_student",
+            legacy_setting_key="VERIFY_STUDENT",
+            legacy_sec_setting_keys=["STORAGE_CLASS"],
             options=storage_kwargs
         )
 

lms/djangoapps/verify_student/tests/test_models.py

@@ -47,6 +47,7 @@
         "CERT_VERIFICATION_PATH": False,
     },
     "DAYS_GOOD_FOR": 10,
+    "STORAGE_CLASS": "storages.backends.s3boto3.S3Boto3Storage"
 }
 
 

lms/djangoapps/verify_student/tests/test_views.py

@@ -1301,6 +1301,7 @@ def test_submit_photos_error_does_not_send_email(self):
             "CERT_VERIFICATION_PATH": False,
         },
         "DAYS_GOOD_FOR": 10,
+        "STORAGE_CLASS": "storages.backends.s3boto3.S3Boto3Storage"
     })
     @httpretty.activate
     def test_submit_photos_for_reverification(self):

openedx/core/djangoapps/content/block_structure/models.py

@@ -86,7 +86,7 @@ def _bs_model_storage():
     return resolve_storage_backend(
         storage_key="block_structures_settings",
         legacy_setting_key="BLOCK_STRUCTURES_SETTINGS",
-        legacy_sec_setting_key="STORAGE_CLASS",
+        legacy_sec_setting_keys=["STORAGE_CLASS"],
         options=storage_kwargs
     )