Allow for prefix before course ID

config/cadet.exs.example

@@ -100,6 +100,7 @@ config :cadet,
   ],
   uploader: [
     assets_bucket: "<unique-identifier>-assets",
+    assets_prefix: "courses/",
     sourcecasts_bucket: "<unique-identifier>-cadet-sourcecasts"
   ],
   # Configuration for Sling integration (executing on remote devices)

config/dev.secrets.exs.example

@@ -78,6 +78,7 @@ config :cadet,
   ],
   uploader: [
     assets_bucket: "source-academy-assets",
+    assets_prefix: "courses-dev/",
     sourcecasts_bucket: "env-cadet-sourcecasts"
   ],
   # Configuration for Sling integration (executing on remote devices)

config/test.exs

@@ -76,6 +76,7 @@ config :cadet,
   ],
   uploader: [
     assets_bucket: "test-sa-assets",
+    assets_prefix: "courses-test/",
     sourcecasts_bucket: "test-cadet-sourcecasts"
   ],
   remote_execution: [

lib/cadet/assets/assets.ex

@@ -20,7 +20,7 @@ defmodule Cadet.Assets.Assets do
       else
         file = upload_params.path
 
-        s3_path = "#{course_id}/#{folder_name}/#{file_name}"
+        s3_path = "#{prefix()}#{course_id}/#{folder_name}/#{file_name}"
 
         file
         |> Upload.stream_file()
@@ -36,7 +36,7 @@ defmodule Cadet.Assets.Assets do
     case validate_folder_name(folder_name) do
       :ok ->
         bucket()
-        |> S3.list_objects(prefix: "#{course_id}/" <> folder_name <> "/")
+        |> S3.list_objects(prefix: "#{prefix()}#{course_id}/" <> folder_name <> "/")
         |> ExAws.stream!()
         |> Enum.map(fn file -> file.key end)
 
@@ -50,7 +50,7 @@ defmodule Cadet.Assets.Assets do
          :ok <- validate_folder_name(folder_name) do
       if object_exists?(course_id, folder_name, file_name) do
         bucket()
-        |> S3.delete_object("#{course_id}/#{folder_name}/#{file_name}")
+        |> S3.delete_object("#{prefix()}#{course_id}/#{folder_name}/#{file_name}")
         |> ExAws.request!()
 
         :ok
@@ -63,7 +63,9 @@ defmodule Cadet.Assets.Assets do
   @spec object_exists?(integer(), binary, binary) :: boolean()
   def object_exists?(course_id, folder_name, file_name) do
     response =
-      bucket() |> S3.head_object("#{course_id}/#{folder_name}/#{file_name}") |> ExAws.request()
+      bucket()
+      |> S3.head_object("#{prefix()}#{course_id}/#{folder_name}/#{file_name}")
+      |> ExAws.request()
 
     case response do
       {:error, _error} -> false
@@ -96,4 +98,6 @@ defmodule Cadet.Assets.Assets do
   end
 
   defp bucket, do: :cadet |> Application.fetch_env!(:uploader) |> Keyword.get(:assets_bucket)
+
+  defp prefix, do: :cadet |> Application.fetch_env!(:uploader) |> Keyword.get(:assets_prefix, "")
 end

test/cadet/assets/assets_test.exs

@@ -54,7 +54,7 @@ defmodule Cadet.Assets.AssetsTest do
                  "testFolder",
                  "test1.png"
                ) ===
-                 "https://#{bucket()}.s3.amazonaws.com/1/testFolder/test1.png"
+                 "https://#{bucket()}.s3.amazonaws.com/courses-test/1/testFolder/test1.png"
       end
     end
   end

test/cadet_web/admin_controllers/admin_assets_controller_test.exs

@@ -128,7 +128,7 @@ defmodule CadetWeb.AdminAssetsControllerTest do
           })
 
         assert json_response(conn, 200) ===
-                 "https://#{bucket()}.s3.amazonaws.com/#{course_id}/testFolder/test.png"
+                 "https://#{bucket()}.s3.amazonaws.com/courses-test/#{course_id}/testFolder/test.png"
       end
     end
   end
@@ -191,7 +191,7 @@ defmodule CadetWeb.AdminAssetsControllerTest do
           })
 
         assert json_response(conn, 200) ===
-                 "https://#{bucket()}.s3.amazonaws.com/#{course_id}/testFolder/nestedFolder/test.png"
+                 "https://#{bucket()}.s3.amazonaws.com/courses-test/#{course_id}/testFolder/nestedFolder/test.png"
       end
     end
   end

test/fixtures/vcr_cassettes/aws/controller_delete_asset#1.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/test2.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/test2.png"
     },
     "response": {
       "binary": false,
@@ -49,7 +49,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/test2.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/test2.png"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/controller_delete_asset#2.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/nestedFolder/test2.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/nestedFolder/test2.png"
     },
     "response": {
       "binary": false,
@@ -49,7 +49,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/nestedFolder/test2.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/nestedFolder/test2.png"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/controller_list_assets#1.json

@@ -18,7 +18,7 @@
     },
     "response": {
       "binary": false,
-      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>117/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>testFolder/</Key><LastModified>2020-07-04T18:53:11.000Z</LastModified><ETag>&quot;d41d8cd98f00b204e9800998ecf8427e&quot;</ETag><Size>0</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>testFolder/test.png</Key><LastModified>2020-07-04T19:04:50.000Z</LastModified><ETag>&quot;3104001edec38fadeb925b9dbddab198&quot;</ETag><Size>8035</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>testFolder/test2.png</Key><LastModified>2020-07-04T19:04:50.000Z</LastModified><ETag>&quot;3104001edec38fadeb925b9dbddab198&quot;</ETag><Size>8035</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>",
+      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>courses-test/117/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>testFolder/</Key><LastModified>2020-07-04T18:53:11.000Z</LastModified><ETag>&quot;d41d8cd98f00b204e9800998ecf8427e&quot;</ETag><Size>0</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>testFolder/test.png</Key><LastModified>2020-07-04T19:04:50.000Z</LastModified><ETag>&quot;3104001edec38fadeb925b9dbddab198&quot;</ETag><Size>8035</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>testFolder/test2.png</Key><LastModified>2020-07-04T19:04:50.000Z</LastModified><ETag>&quot;3104001edec38fadeb925b9dbddab198&quot;</ETag><Size>8035</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>",
       "headers": {
         "Date": "Sat, 04 Jul 2020 19:04:57 GMT",
         "x-amz-bucket-region": "ap-southeast-1",

test/fixtures/vcr_cassettes/aws/controller_upload_asset#1.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -45,7 +45,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -75,7 +75,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/test.png"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/controller_upload_asset#2.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/nestedFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/nestedFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -45,7 +45,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/nestedFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/nestedFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -75,7 +75,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/117/testFolder/nestedFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/117/testFolder/nestedFolder/test.png"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/model_delete_asset#1.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test4.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test4.png"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/model_delete_asset#2.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -49,7 +49,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test.png"
     },
     "response": {
       "binary": false,
@@ -62,4 +62,4 @@
       "type": "ok"
     }
   }
-]
+]

test/fixtures/vcr_cassettes/aws/model_list_assets#1.json

@@ -18,7 +18,7 @@
     },
     "response": {
       "binary": false,
-      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>1/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>1/testFolder/</Key><LastModified>2021-08-02T10:23:39.000Z</LastModified><ETag>&quot;d41d8cd98f00b204e9800998ecf8427e&quot;</ETag><Size>0</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>1/testFolder/test.png</Key><LastModified>2021-08-02T10:56:36.000Z</LastModified><ETag>&quot;33c5d4f094a7727780a3c63babae1083&quot;</ETag><Size>2568</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>1/testFolder/test2.png</Key><LastModified>2021-08-02T10:25:15.000Z</LastModified><ETag>&quot;af2ab457d8b118efa176bc12cff4895f&quot;</ETag><Size>2996</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>",
+      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>courses-test/1/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>1/testFolder/</Key><LastModified>2021-08-02T10:23:39.000Z</LastModified><ETag>&quot;d41d8cd98f00b204e9800998ecf8427e&quot;</ETag><Size>0</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>1/testFolder/test.png</Key><LastModified>2021-08-02T10:56:36.000Z</LastModified><ETag>&quot;33c5d4f094a7727780a3c63babae1083&quot;</ETag><Size>2568</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>1/testFolder/test2.png</Key><LastModified>2021-08-02T10:25:15.000Z</LastModified><ETag>&quot;af2ab457d8b118efa176bc12cff4895f&quot;</ETag><Size>2996</Size><Owner><ID>98bd2bd2de0c976fb511f741fea454cb1026b9e1f9ac9160fd9f51d07e765f19</ID><DisplayName>unixsp+cs1101s</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>",
       "headers": {
         "Date": "Mon, 02 Aug 2021 10:59:51 GMT",
         "x-amz-bucket-region": "ap-southeast-1",
@@ -30,4 +30,4 @@
       "type": "ok"
     }
   }
-]
+]

test/fixtures/vcr_cassettes/aws/model_list_assets#2.json

@@ -18,7 +18,7 @@
     },
     "response": {
       "binary": false,
-      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>2/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated></ListBucketResult>",
+      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>test-sa-assets</Name><Prefix>courses-test/2/testFolder/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated></ListBucketResult>",
       "headers": {
         "Date": "Mon, 02 Aug 2021 10:59:49 GMT",
         "x-amz-bucket-region": "ap-southeast-1",
@@ -30,4 +30,4 @@
       "type": "ok"
     }
   }
-]
+]

test/fixtures/vcr_cassettes/aws/model_upload_asset#1.json

@@ -15,7 +15,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test2.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test2.png"
     },
     "response": {
       "binary": false,
@@ -33,4 +33,4 @@
       "type": "ok"
     }
   }
-]
+]

test/fixtures/vcr_cassettes/aws/model_upload_asset#2.json

@@ -15,11 +15,11 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test1.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test1.png"
     },
     "response": {
       "binary": false,
-      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<InitiateMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Bucket>test-sa-assets</Bucket><Key>1/testFolder/test1.png</Key><UploadId>Jk9B8v0z6kdQbTsuU9S4Wu0r5oCPGDwid8meJ4h6sdUGwNyMKSetyBSCooSrl6zormlRXJDxmzcZMQJp9ylbq.aNQql.Vf048gE28hUz5_.bSzARS8fxYzPQFjgvxgkVLK4sCM.QSI3KtEc6JpYJHg--</UploadId></InitiateMultipartUploadResult>",
+      "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<InitiateMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Bucket>test-sa-assets</Bucket><Key>courses-test/1/testFolder/test1.png</Key><UploadId>Jk9B8v0z6kdQbTsuU9S4Wu0r5oCPGDwid8meJ4h6sdUGwNyMKSetyBSCooSrl6zormlRXJDxmzcZMQJp9ylbq.aNQql.Vf048gE28hUz5_.bSzARS8fxYzPQFjgvxgkVLK4sCM.QSI3KtEc6JpYJHg--</UploadId></InitiateMultipartUploadResult>",
       "headers": {
         "Date": "Mon, 02 Aug 2021 10:59:53 GMT",
         "Transfer-Encoding": "chunked",
@@ -45,7 +45,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test1.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test1.png"
     },
     "response": {
       "binary": false,
@@ -75,7 +75,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/1/testFolder/test1.png"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/test-sa-assets/courses-test/1/testFolder/test1.png"
     },
     "response": {
       "binary": false,
@@ -90,4 +90,4 @@
       "type": "ok"
     }
   }
-]
+]