Fix tests

scalableminds · Nov 4, 2024 · af3bf71 · af3bf71
1 parent 38474bf
commit af3bf71
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 37 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -38,6 +38,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Users without edit permissions to a dataset can no longer delete sharing tokens via the API. [#8083](https://github.com/scalableminds/webknossos/issues/8083)
 - Fixed downloading task annotations of teams you are not in, when accessing directly via URI. [#8155](https://github.com/scalableminds/webknossos/pull/8155)
 - Deleting a bounding box is now possible independently of a visible segmentation layer. [#8164](https://github.com/scalableminds/webknossos/pull/8164)
+- S3-compliant object storages can now be accessed via HTTPS. [#8167](https://github.com/scalableminds/webknossos/pull/8167)
 
 ### Removed
 

diff --git a/test/backend/DataVaultTestSuite.scala b/test/backend/DataVaultTestSuite.scala
@@ -93,11 +93,14 @@ class DataVaultTestSuite extends PlaySpec {
       "using S3 data vault" should {
         "return correct response" in {
           val uri = new URI("s3://janelia-cosem-datasets/jrc_hela-3/jrc_hela-3.n5/em/fibsem-uint16/")
-          val vaultPath = new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None)))
-          val bytes =
-            (vaultPath / "s0/5/5/5").readBytes(Some(range))(globalExecutionContext).get(handleFoxJustification)
-          assert(bytes.length == range.length)
-          assert(bytes.take(10).sameElements(Array(0, 0, 0, 3, 0, 0, 0, 64, 0, 0)))
+          WsTestClient.withClient { ws =>
+            val vaultPath =
+              new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext))
+            val bytes =
+              (vaultPath / "s0/5/5/5").readBytes(Some(range))(globalExecutionContext).get(handleFoxJustification)
+            assert(bytes.length == range.length)
+            assert(bytes.take(10).sameElements(Array(0, 0, 0, 3, 0, 0, 0, 64, 0, 0)))
+          }
         }
       }
     }
@@ -135,59 +138,69 @@ class DataVaultTestSuite extends PlaySpec {
       "using s3 data vault" should {
         "return correctly decoded brotli-compressed data" in {
           val uri = new URI("s3://open-neurodata/bock11/image/4_4_40")
-          val vaultPath = new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None)))
-          val bytes =
-            (vaultPath / "33792-34304_29696-30208_3216-3232")
-              .readBytes()(globalExecutionContext)
-              .get(handleFoxJustification)
-          assert(bytes.take(10).sameElements(Array(-87, -95, -85, -94, -101, 124, 115, 100, 113, 111)))
+          WsTestClient.withClient { ws =>
+            val vaultPath =
+              new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext))
+            val bytes =
+              (vaultPath / "33792-34304_29696-30208_3216-3232")
+                .readBytes()(globalExecutionContext)
+                .get(handleFoxJustification)
+            assert(bytes.take(10).sameElements(Array(-87, -95, -85, -94, -101, 124, 115, 100, 113, 111)))
+          }
         }
 
         "return empty box" when {
           "requesting a non-existent bucket" in {
             val uri = new URI(s"s3://non-existent-bucket${UUID.randomUUID}/non-existent-object")
-            val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None))
-            val vaultPath = new VaultPath(uri, s3DataVault)
-            val result = vaultPath.readBytes()(globalExecutionContext).await(handleFoxJustification)
-            assertBoxEmpty(result)
+            WsTestClient.withClient { ws =>
+              val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext)
+              val vaultPath = new VaultPath(uri, s3DataVault)
+              val result = vaultPath.readBytes()(globalExecutionContext).await(handleFoxJustification)
+              assertBoxEmpty(result)
+            }
           }
         }
 
         "return empty box" when {
           "requesting a non-existent object in existent bucket" in {
             val uri = new URI(s"s3://open-neurodata/non-existent-object${UUID.randomUUID}")
-            val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None))
-            val vaultPath = new VaultPath(uri, s3DataVault)
-            val result = vaultPath.readBytes()(globalExecutionContext).await(handleFoxJustification)
-            assertBoxEmpty(result)
+            WsTestClient.withClient { ws =>
+              val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext)
+              val vaultPath = new VaultPath(uri, s3DataVault)
+              val result = vaultPath.readBytes()(globalExecutionContext).await(handleFoxJustification)
+              assertBoxEmpty(result)
+            }
           }
         }
       }
     }
 
     "using directory list requests" when {
       val uri = new URI("s3://janelia-cosem-datasets/jrc_hela-3/jrc_hela-3.n5/em/fibsem-uint16/")
-      val vaultPath = new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None)))
-
-      "using s3 data vault" should {
-        "list available directories" in {
-          val result = vaultPath.listDirectory(maxItems = 3)(globalExecutionContext).get(handleFoxJustification)
-          assert(result.length == 3)
-          assert(
-            result.exists(
-              _.toUri == new URI("s3://janelia-cosem-datasets/jrc_hela-3/jrc_hela-3.n5/em/fibsem-uint16/s0/")))
-        }
+      WsTestClient.withClient { ws =>
+        val vaultPath =
+          new VaultPath(uri, S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext))
+
+        "using s3 data vault" should {
+          "list available directories" in {
+            val result = vaultPath.listDirectory(maxItems = 3)(globalExecutionContext).get(handleFoxJustification)
+            assert(result.length == 3)
+            assert(
+              result.exists(
+                _.toUri == new URI("s3://janelia-cosem-datasets/jrc_hela-3/jrc_hela-3.n5/em/fibsem-uint16/s0/")))
+          }
 
-        "return failure" when {
-          "requesting directory listing on non-existent bucket" in {
-            val uri = new URI(f"s3://non-existent-bucket${UUID.randomUUID}/non-existent-object/")
-            val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None))
-            val vaultPath = new VaultPath(uri, s3DataVault)
-            val result = vaultPath.listDirectory(maxItems = 5)(globalExecutionContext).await(handleFoxJustification)
-            assertBoxFailure(result)
+          "return failure" when {
+            "requesting directory listing on non-existent bucket" in {
+              val uri = new URI(f"s3://non-existent-bucket${UUID.randomUUID}/non-existent-object/")
+              val s3DataVault = S3DataVault.create(RemoteSourceDescriptor(uri, None), ws)(globalExecutionContext)
+              val vaultPath = new VaultPath(uri, s3DataVault)
+              val result = vaultPath.listDirectory(maxItems = 5)(globalExecutionContext).await(handleFoxJustification)
+              assertBoxFailure(result)
+            }
           }
-        }
 
+        }
       }
     }