Merge pull request #256 from wellcomecollection/S3StreamWritable-bug-fix

S3StreamWritable bug fix
wellcomecollection · Oct 7, 2024 · 4f4a367 · 4f4a367
2 parents 54abc18 + 197d6a2
commit 4f4a367
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,10 +92,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: create-release
     strategy:
+      fail-fast: false
       matrix:
         service:
           - fixtures
           - http
+          - http_typesafe
           - json
           - typesafe_app
           - monitoring

diff --git a/.github/workflows/report-evictions.yml b/.github/workflows/report-evictions.yml
@@ -17,6 +17,7 @@ jobs:
         service:
           - fixtures
           - http
+          - http_typesafe
           - json
           - typesafe_app
           - monitoring

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,6 +15,7 @@ jobs:
         service:
           - fixtures
           - http
+          - http_typesafe
           - json
           - typesafe_app
           - monitoring

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,3 @@
+RELEASE_TYPE: patch
+
+S3StreamWritable bug fix (replace `read` by `readNBytes`). 
diff --git a/storage/src/main/scala/weco/storage/store/s3/S3StreamWritable.scala b/storage/src/main/scala/weco/storage/store/s3/S3StreamWritable.scala
@@ -41,7 +41,7 @@ trait S3StreamWritable
             if (inputStream.length > 0) {
               val bytes: Array[Byte] = new Array[Byte](inputStream.length.toInt)
               val bytesRead =
-                inputStream.read(bytes, 0, inputStream.length.toInt)
+                inputStream.readNBytes(bytes, 0, inputStream.length.toInt)
 
               if (bytesRead < inputStream.length) {
                 throw new RuntimeException(
@@ -93,7 +93,7 @@ trait S3StreamWritable
       val partLength = (end - start).toInt
 
       val bytes: Array[Byte] = new Array[Byte](partLength)
-      val bytesRead = inputStream.read(bytes, 0, partLength)
+      val bytesRead = inputStream.readNBytes(bytes, 0, partLength)
 
       if (bytesRead < partLength) {
         throw new RuntimeException(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		RELEASE_TYPE: patch

		S3StreamWritable bug fix (replace `read` by `readNBytes`).