feat: S3 transfer manager improvements

.changes/nextrelease/feat-s3-transfer-manager-improvements.json

@@ -0,0 +1,7 @@
+[
+  {
+    "type": "enhancement",
+    "category": "S3",
+    "description": "Add new features and improvements to S3 Transfer Manager.\n\nNew Features:\n- Resume failed multipart uploads\n- Resume failed multipart downloads\n\nImprovements:\n- FileDownloadHandler now supports concurrent downloads for improved speed\n- Directory operations moved to an independent transfer utility\n- Directory operations now support both single object listeners and directory-level listeners, including a directory progress tracker"
+  }
+]

features/s3Transfer/s3TransferManager.feature

@@ -57,6 +57,7 @@ Feature: S3 Transfer Manager
     Examples:
       | filename                | content                            | checksum_algorithm |
       | myfile-test-5-1.txt     | This is a test file content #1     | crc32              |
+      | myfile-test-5-2.txt     | This is a test file content #2     | crc32c             |
       | myfile-test-5-3.txt     | This is a test file content #3     | sha256             |
       | myfile-test-5-4.txt     | This is a test file content #4     | sha1               |
 
@@ -139,4 +140,29 @@ Feature: S3 Transfer Manager
       | file       | size      | algorithm | checksum |
       | myfile-9-4 | 10485760  | crc32     | vMU7HA== |
       | myfile-9-5 | 15728640  | crc32     | gjLQ1Q== |
-      | myfile-9-6 | 7340032   | crc32     | CKbfZQ== |
+      | myfile-9-6 | 7340032   | crc32     | CKbfZQ== |
+
+  Scenario Outline: Resume multipart download
+    Given I have a file <file> in S3 that requires multipart download
+    When I try the download for file <file>, with resume enabled, it fails
+    Then A resumable file for file <file> must exists
+    Then We resume the download for file <file> and it should succeed
+    Examples:
+      | file                       |
+      | resume-download-file-1.txt |
+      | resume-download-file-2.txt |
+      | resume-download-file-3.txt |
+      | resume-download-file-4.txt |
+
+  Scenario Outline: Resume multipart upload
+    Given I have a file <file> on disk that requires multipart upload
+    When I try to upload the file <file>, with resume enabled, it fails
+    Then A resumable file for file <file> must exists
+    Then We resume the upload for file <file> and it should succeed
+    Then The file <file> in s3 should match the local file
+    Examples:
+      | file                       |
+      | resume-upload-file-1.txt |
+      | resume-upload-file-2.txt |
+      | resume-upload-file-3.txt |
+      | resume-upload-file-4.txt |

src/S3/CalculatesChecksumTrait.php

@@ -8,7 +8,7 @@
 
 trait CalculatesChecksumTrait
 {
-    private static $supportedAlgorithms = [
+    public static array $supportedAlgorithms = [
         'crc32c' => true,
         'crc32' => true,
         'sha256' => true,
@@ -47,7 +47,13 @@ public static function getEncodedValue($requestedAlgorithm, $value) {
             if ($requestedAlgorithm === "crc32") {
                 $requestedAlgorithm = "crc32b";
             }
-            return base64_encode(Psr7\Utils::hash($value, $requestedAlgorithm, true));
+
+            return base64_encode(
+                Psr7\Utils::hash(Psr7\Utils::streamFor($value),
+                    $requestedAlgorithm,
+                    true
+                )
+            );
         }
 
         $validAlgorithms = implode(', ', array_keys(self::$supportedAlgorithms));
@@ -56,4 +62,23 @@ public static function getEncodedValue($requestedAlgorithm, $value) {
             . "  Valid algorithms supported by the runtime are {$validAlgorithms}."
         );
     }
+
+    /**
+     * Returns the first checksum available, if available.
+     *
+     * @param array $parameters
+     *
+     * @return string|null
+     */
+    public static function filterChecksum(array $parameters): ?string
+    {
+        foreach (self::$supportedAlgorithms as $algorithm => $_) {
+            $checksumAlgorithm = "Checksum" . strtoupper($algorithm);
+            if (isset($parameters[$checksumAlgorithm])) {
+                return $checksumAlgorithm;
+            }
+        }
+
+        return null;
+    }
 }