🚚(back) serve legacy thumbnails from Scaleway S3

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

Author: wilbrdt

src/backend/marsha/core/models/video.py

@@ -20,6 +20,7 @@
 
 from marsha.core.defaults import (
     APPROVAL,
+    AWS_STORAGE_BASE_DIRECTORY,
     CELERY_PIPELINE,
     DELETED,
     DELETED_STORAGE_BASE_DIRECTORY,
@@ -793,30 +794,6 @@ class Meta:
             )
         ]
 
-    def get_source_s3_key(self, stamp=None):
-        """Compute the S3 key in the source bucket.
-
-        It is built from the video ID + ID of the thumbnail + version stamp.
-
-        Parameters
-        ----------
-        stamp: Type[string]
-            Passing a value for this argument will return the source S3 key for the thumbnail
-            assuming its active stamp is set to this value. This is useful to create an
-            upload policy for this prospective version of the thumbnail, so that the client can
-            upload the file to S3 and the confirmation lambda can set the `uploaded_on` field
-            to this value only after the file upload and processing is successful.
-
-        Returns
-        -------
-        string
-            The S3 key for the thumbnail file in the source bucket, where uploaded files are
-            stored before they are converted and copied to the destination bucket.
-
-        """
-        stamp = stamp or self.uploaded_on_stamp()
-        return f"{self.video.pk}/thumbnail/{self.pk}/{stamp}"
-
     def get_storage_prefix(
         self,
         stamp=None,
@@ -844,6 +821,10 @@ def get_storage_prefix(
         """
         stamp = stamp or self.uploaded_on_stamp()
         base = base_dir
+
+        if base_dir == AWS_STORAGE_BASE_DIRECTORY:
+            return f"{base}/{self.video.pk}/thumbnails"
+
         if base_dir == DELETED_STORAGE_BASE_DIRECTORY:
             base = f"{DELETED_STORAGE_BASE_DIRECTORY}/{VOD_STORAGE_BASE_DIRECTORY}"
 

src/backend/marsha/core/serializers/thumbnail.py

@@ -5,7 +5,7 @@
 
 from rest_framework import serializers
 
-from marsha.core.defaults import CELERY_PIPELINE
+from marsha.core.defaults import AWS_STORAGE_BASE_DIRECTORY, CELERY_PIPELINE
 from marsha.core.models import Thumbnail
 from marsha.core.serializers.base import TimestampField
 from marsha.core.storage.storage_class import file_storage
@@ -122,10 +122,10 @@ def get_urls(self, obj):
                 urls[resolution] = file_storage.url(f"{base}/{resolution}.jpg")
             return urls
 
-        # Default AWS fallback:
-        base = f"{settings.AWS_S3_URL_PROTOCOL}://{settings.CLOUDFRONT_DOMAIN}/{obj.video.pk}"
-        urls = {}
+        # Default fallback to location under "aws" directory
+        base = obj.get_storage_prefix(base_dir=AWS_STORAGE_BASE_DIRECTORY)
         stamp = time_utils.to_timestamp(obj.uploaded_on)
+        urls = {}
         for resolution in settings.VIDEO_RESOLUTIONS:
-            urls[resolution] = f"{base}/thumbnails/{stamp}_{resolution}.jpg"
+            urls[resolution] = file_storage.url(f"{base}/{stamp}_{resolution}.jpg")
         return urls

src/backend/marsha/core/tests/api/thumbnails/test_retrieve.py

@@ -23,6 +23,10 @@
 )
 
 
+# flake8: noqa: E501
+# pylint: disable=line-too-long
+
+
 class ThumbnailRetrieveApiTest(TestCase):
     """Test the retrieve API of the thumbnail object."""
 
@@ -199,7 +203,6 @@ def test_api_thumbnail_instructor_read_detail_in_read_only(self):
 
         self.assertEqual(response.status_code, 403)
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_thumbnail_read_detail_token_user(self):
         """Instructors should be able to read details of thumbnail associated to their video."""
         video = VideoFactory(
@@ -245,7 +248,6 @@ def test_api_thumbnail_administrator_read_detail_in_read_only(self):
 
         self.assertEqual(response.status_code, 403)
 
-    @override_settings(CLOUDFRONT_SIGNED_URLS_ACTIVE=False)
     def test_api_thumbnail_read_detail_admin_user(self):
         """Admin should be able to read details of thumbnail associated to their video."""
         video = VideoFactory(
@@ -278,6 +280,7 @@ def test_api_thumbnail_read_detail_admin_user(self):
             },
         )
 
+    @override_settings(MEDIA_URL="https://abc.svc.edge.scw.cloud/")
     def test_api_thumbnail_read_ready_thumbnail(self):
         """A ready thumbnail should have computed urls."""
         video = VideoFactory(
@@ -310,15 +313,15 @@ def test_api_thumbnail_read_ready_thumbnail(self):
                 "is_ready_to_show": True,
                 "upload_state": "ready",
                 "urls": {
-                    "240": "https://abc.cloudfront.net/78338c1c-356e-4156-bd95-5bed71ffb655/"
+                    "240": "https://abc.svc.edge.scw.cloud/aws/78338c1c-356e-4156-bd95-5bed71ffb655/"
                     "thumbnails/1533686400_240.jpg",
-                    "360": "https://abc.cloudfront.net/78338c1c-356e-4156-bd95-5bed71ffb655/"
+                    "360": "https://abc.svc.edge.scw.cloud/aws/78338c1c-356e-4156-bd95-5bed71ffb655/"
                     "thumbnails/1533686400_360.jpg",
-                    "480": "https://abc.cloudfront.net/78338c1c-356e-4156-bd95-5bed71ffb655/"
+                    "480": "https://abc.svc.edge.scw.cloud/aws/78338c1c-356e-4156-bd95-5bed71ffb655/"
                     "thumbnails/1533686400_480.jpg",
-                    "720": "https://abc.cloudfront.net/78338c1c-356e-4156-bd95-5bed71ffb655/"
+                    "720": "https://abc.svc.edge.scw.cloud/aws/78338c1c-356e-4156-bd95-5bed71ffb655/"
                     "thumbnails/1533686400_720.jpg",
-                    "1080": "https://abc.cloudfront.net/78338c1c-356e-4156-bd95-5bed71ffb655/"
+                    "1080": "https://abc.svc.edge.scw.cloud/aws/78338c1c-356e-4156-bd95-5bed71ffb655/"
                     "thumbnails/1533686400_1080.jpg",
                 },
                 "video": str(video.id),