Return error from WriteFilesToStream (#61)

jfrog · Apr 10, 2024 · 31bb808 · 31bb808
1 parent e45c025
commit 31bb808
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/http/filestream/filestream.go b/http/filestream/filestream.go
@@ -73,7 +73,8 @@ func WriteFilesToStream(multipartWriter *multipart.Writer, filesList []*FileInfo
 	defer ioutils.Close(multipartWriter, &err)
 	for _, file := range filesList {
 		if err = writeFile(multipartWriter, file); err != nil {
-			return writeErr(multipartWriter, file, err)
+			// Returning the error from writeFile with a possible error from the writeErr function
+			return errors.Join(err, writeErr(multipartWriter, file, err))
 		}
 	}
 

diff --git a/http/filestream/filestream_test.go b/http/filestream/filestream_test.go
@@ -59,7 +59,7 @@ func TestWriteFilesToStreamWithError(t *testing.T) {
 
 	// Call WriteFilesToStream and expect an error
 	err := WriteFilesToStream(multipartWriter, []*FileInfo{file})
-	require.NoError(t, err)
+	assert.Error(t, err)
 
 	multipartReader := multipart.NewReader(body, multipartWriter.Boundary())
 	form, err := multipartReader.ReadForm(10 * 1024)