🚚(back) serve legacy markdown images from Scaleway S3

Markdown images are now served from the aws/ directory in Scaleway S3.
They are served using the django-storage already in place.
As the newer markdown images are already stored in Scaleway, we do not
rename these files and allow them to be served without requiring signed URLs.

Author: wilbrdt

CHANGELOG.md

@@ -12,6 +12,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Serve legacy classroom documents from Scaleway S3 after AWS migration
 - Serve legacy videos and related files from Scaleway S3 after AWS migration
+- Serve legacy Markdown images from Scaleway S3 after AWS migration
 
 ## [5.9.1] - 2025-06-25
 

src/backend/marsha/markdown/migrations/0009_markdownimage_fix_storage_location.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2025-07-09 07:14
+
+from django.db import migrations
+
+from marsha.core.defaults import AWS_S3
+
+
+def fix_storage_location_to_aws(apps, schema_editor):
+    """Fix the storage_location field for existing markdown images on AWS."""
+    MarkdownImage = apps.get_model("markdown", "MarkdownImage")
+    MarkdownImage.objects.filter(storage_location="AWS_S3").update(
+        storage_location=AWS_S3
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("markdown", "0008_markdownimage_fill_storage_location"),
+    ]
+
+    operations = [
+        migrations.RunPython(fix_storage_location_to_aws, migrations.RunPython.noop),
+    ]

src/backend/marsha/markdown/models.py

@@ -14,6 +14,7 @@
 from parler.models import TranslatableModelMixin, TranslatedFields
 
 from marsha.core.defaults import (
+    AWS_STORAGE_BASE_DIRECTORY,
     DELETED_STORAGE_BASE_DIRECTORY,
     MARKDOWN_DOCUMENT_STORAGE_BASE_DIRECTORY,
     SCW_S3,
@@ -240,6 +241,12 @@ def get_storage_key(
         stamp = stamp or self.uploaded_on_stamp()
 
         base = base_dir
+        if base == AWS_STORAGE_BASE_DIRECTORY:
+            return (
+                f"{base}/{self.markdown_document.pk}/markdown-image/"
+                f"{self.pk}/{stamp}.{self.extension.lstrip('.')}"
+            )
+
         if base == DELETED_STORAGE_BASE_DIRECTORY:
             base = f"{base}/{MARKDOWN_DOCUMENT_STORAGE_BASE_DIRECTORY}"
 

src/backend/marsha/markdown/serializers.py

@@ -9,17 +9,20 @@
 
 from rest_framework import serializers
 
-from marsha.core.defaults import MARKDOWN_DOCUMENT_STORAGE_BASE_DIRECTORY, SCW_S3
+from marsha.core.defaults import (
+    AWS_S3,
+    AWS_STORAGE_BASE_DIRECTORY,
+    MARKDOWN_DOCUMENT_STORAGE_BASE_DIRECTORY,
+)
 from marsha.core.serializers import (
     BaseInitiateUploadSerializer,
     ReadOnlyModelSerializer,
     TimestampField,
     UploadableFileWithExtensionSerializerMixin,
-    get_resource_cloudfront_url_params,
 )
 from marsha.core.serializers.playlist import PlaylistLiteSerializer
 from marsha.core.storage.storage_class import file_storage
-from marsha.core.utils import cloudfront_utils, time_utils
+from marsha.core.utils import time_utils
 from marsha.markdown.models import MarkdownDocument, MarkdownImage
 
 
@@ -99,23 +102,12 @@ def get_url(self, obj):
         if not obj.uploaded_on:
             return None
 
-        if obj.storage_location == SCW_S3:
+        if obj.storage_location == AWS_S3:
+            file_key = obj.get_storage_key(base_dir=AWS_STORAGE_BASE_DIRECTORY)
+        else:
             file_key = obj.get_storage_key()
 
-            return file_storage.url(file_key)
-
-        base = f"{settings.AWS_S3_URL_PROTOCOL}://{settings.CLOUDFRONT_DOMAIN}"
-        base = f"{base}/{obj.markdown_document_id}/markdown-image"
-        stamp = time_utils.to_timestamp(obj.uploaded_on)
-        url = f"{base}/{obj.pk}/{stamp}.{obj.extension.lstrip('.')}"
-
-        if not settings.CLOUDFRONT_SIGNED_URLS_ACTIVE:
-            return url
-
-        params = get_resource_cloudfront_url_params(
-            "markdown-document", obj.markdown_document_id
-        )
-        return cloudfront_utils.build_signed_url(url, params)
+        return file_storage.url(file_key)
 
 
 class MarkdownImageInitiateUploadSerializer(BaseInitiateUploadSerializer):

src/backend/marsha/markdown/tests/api/markdown_images/test_retrieve.py

@@ -71,7 +71,6 @@ def test_api_markdown_image_instructor_read_detail_in_read_only(self):
 
         self.assertEqual(response.status_code, 403)
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_markdown_image_read_detail_token_user(self):
         """
         Instructors should be able to read details of Markdown image
@@ -126,7 +125,6 @@ def test_api_markdown_image_administrator_read_detail_in_read_only(self):
 
         self.assertEqual(response.status_code, 403)
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_markdown_image_read_detail_admin_user(self):
         """
         Admin should be able to read details of Markdown image associated
@@ -165,9 +163,7 @@ def test_api_markdown_image_read_detail_admin_user(self):
             },
         )
 
-    @override_settings(
-        MEDIA_URL="https://abc.svc.edge.scw.cloud/",
-    )
+    @override_settings(MEDIA_URL="https://abc.svc.edge.scw.cloud/")
     def test_api_markdown_image_read_ready_markdown_image(self):
         """A ready Markdown image on SCW should have computed urls."""
         markdown_document = MarkdownDocumentFactory(
@@ -212,6 +208,7 @@ def test_api_markdown_image_read_ready_markdown_image(self):
             },
         )
 
+    @override_settings(MEDIA_URL="https://abc.svc.edge.scw.cloud/")
     def test_api_markdown_image_read_ready_markdown_image_aws(self):
         """A ready Markdown image on AWS should have computed urls."""
         markdown_document = MarkdownDocumentFactory(
@@ -248,7 +245,7 @@ def test_api_markdown_image_read_ready_markdown_image_aws(self):
                 "is_ready_to_show": True,
                 "upload_state": "ready",
                 "url": (
-                    "https://abc.cloudfront.net/"
+                    "https://abc.svc.edge.scw.cloud/aws/"
                     "78338c1c-356e-4156-bd95-5bed71ffb655/markdown-image/"
                     "9ddf9c1f-ec88-4a3a-bfa0-423c4fe89b15/1533686400.gif"
                 ),
@@ -272,7 +269,6 @@ def test_api_markdown_image_read_detail_user_access_token(self):
 
         self.assertEqual(response.status_code, 403)
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_markdown_image_read_detail_user_access_token_organization_admin(self):
         """
         An organization administrator should be able to read details of Markdown image
@@ -306,7 +302,6 @@ def test_api_markdown_image_read_detail_user_access_token_organization_admin(sel
             },
         )
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_markdown_image_read_detail_user_access_token_playlist_admin(self):
         """
         A playlist administrator should be able to read details of Markdown image