Add s3 file storage key prefix.

fleetspace · Mar 1, 2019 · 8d90730 · 8d90730
1 parent 1a10aa3
commit 8d90730
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -281,3 +281,4 @@ def immutable_file_test(path, url):
 WHITENOISE_IMMUTABLE_FILE_TEST = immutable_file_test
 
 S3_FILE_BUCKET = env.str('DJANGO_S3_FILE_BUCKET')
+S3_FILE_PREFIX = env.str('DJANGO_S3_FILE_PREFIX', default='missioncontrol/filestorage/')
diff --git a/missioncontrol/home/models.py b/missioncontrol/home/models.py
@@ -481,14 +481,16 @@ class S3File(models.Model, Serializable):
     task_run = models.ForeignKey(TaskRun, to_field='uuid', related_name='files',
                                  on_delete=models.PROTECT, null=True, blank=True)
 
-    # TODO prefix these keys
+    def get_prefix(self):
+        return f'{settings.S3_FILE_PREFIX}{self.cid}'
+
     def get_download_url(self):
         s3 = boto3.client('s3')
         url = s3.generate_presigned_url(
             ClientMethod='get_object',
             Params={
                 'Bucket': self.bucket,
-                'Key': self.cid,
+                'Key': self.get_prefix(),
             }
         )
 
@@ -498,7 +500,7 @@ def get_upload_url(self):
         s3 = boto3.client('s3')
         post = s3.generate_presigned_post(
             Bucket=self.bucket,
-            Key=self.cid
+            Key=self.get_prefix()
         )
 
         return post
Original file line number	Diff line number	Diff line change
Expand Up		@@ -281,3 +281,4 @@ def immutable_file_test(path, url):
		WHITENOISE_IMMUTABLE_FILE_TEST = immutable_file_test

		S3_FILE_BUCKET = env.str('DJANGO_S3_FILE_BUCKET')
		S3_FILE_PREFIX = env.str('DJANGO_S3_FILE_PREFIX', default='missioncontrol/filestorage/')