s3store: Replace own multi-error implementation with errors.Join

tus · Oct 4, 2024 · 9779a84 · 9779a84
1 parent 8d43cf2
commit 9779a84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/pkg/s3store/multi_error.go b/pkg/s3store/multi_error.go
diff --git a/pkg/s3store/s3store.go b/pkg/s3store/s3store.go
@@ -826,7 +826,7 @@ func (upload s3Upload) Terminate(ctx context.Context) error {
 	wg.Wait()
 
 	if len(errs) > 0 {
-		return newMultiError(errs)
+		return errors.Join(errs...)
 	}
 
 	return nil

diff --git a/pkg/s3store/s3store_test.go b/pkg/s3store/s3store_test.go
@@ -1196,7 +1196,7 @@ func TestTerminateWithErrors(t *testing.T) {
 	assert.Nil(err)
 
 	err = store.AsTerminatableUpload(upload).Terminate(context.Background())
-	assert.Equal("Multiple errors occurred:\n\tAWS S3 Error (hello) for object uploadId: it's me.\n", err.Error())
+	assert.Equal("AWS S3 Error (hello) for object uploadId: it's me.", err.Error())
 }
 
 func TestConcatUploadsUsingMultipart(t *testing.T) {