Fix CR

io/multiwriter.go

@@ -7,7 +7,7 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-var ErrShortWrite = errors.New("short write")
+var ErrShortWrite = errors.New("The number of bytes written is less than the length of the input")
 
 type asyncMultiWriter struct {
 	writers []io.Writer
@@ -16,7 +16,7 @@ type asyncMultiWriter struct {
 
 // AsyncMultiWriter creates a writer that duplicates its writes to all the
 // provided writers asynchronous
-func AsyncMultiWriter(limit int,writers ...io.Writer) io.Writer {
+func AsyncMultiWriter(limit int, writers ...io.Writer) io.Writer {
 	w := make([]io.Writer, len(writers))
 	copy(w, writers)
 	return &asyncMultiWriter{writers: w, limit: limit}
@@ -28,18 +28,17 @@ func (amw *asyncMultiWriter) Write(p []byte) (int, error) {
 	eg := errgroup.Group{}
 	eg.SetLimit(amw.limit)
 	for _, w := range amw.writers {
-		func(w io.Writer) {
-			eg.Go(func() error {
-				n, err := w.Write(p)
-				if err != nil {
-					return err
-				}
-				if n != len(p) {
-					return ErrShortWrite
-				}
-				return nil
-			})
-		}(w)
+		currentWriter := w
+		eg.Go(func() error {
+			n, err := currentWriter.Write(p)
+			if err != nil {
+				return err
+			}
+			if n != len(p) {
+				return ErrShortWrite
+			}
+			return nil
+		})
 	}
 
 	return len(p), eg.Wait()

io/multiwriter_test.go

@@ -19,13 +19,11 @@ func TestAsyncMultiWriter(t *testing.T) {
 		assert.Equal(t, len(data), n)
 
 		// Check if data is correctly written to both writers
-		if buf1.String() != string(data) || buf2.String() != string(data) {
-			t.Errorf("Data not written correctly to all writers")
-		}
+		assert.Equal(t, string(data), buf1.String())
+		assert.Equal(t, string(data), buf2.String())
 	}
 }
 
-// TestAsyncMultiWriter_Error tests the error handling behavior of AsyncMultiWriter.
 func TestAsyncMultiWriter_Error(t *testing.T) {
 	expectedErr := errors.New("write error")
 
@@ -34,9 +32,7 @@ func TestAsyncMultiWriter_Error(t *testing.T) {
 	multiWriter := AsyncMultiWriter(2, mockWriter)
 
 	_, err := multiWriter.Write([]byte("test data"))
-	if err != expectedErr {
-		t.Errorf("Expected error: %v, got: %v", expectedErr, err)
-	}
+	assert.Equal(t, expectedErr, err)
 }
 
 // Mock writer to simulate Write errors

unarchive/archive.go

@@ -136,8 +136,8 @@ func (u *Unarchiver) byExtension(filename string) (interface{}, error) {
 
 // Make sure the archive is free from Zip Slip and Zip symlinks attacks
 func inspectArchive(archive interface{}, localArchivePath, destinationDir string) error {
-	// If the destination directory ends with a slash, delete it. 
-	// This is necessary to handle a situation where the entry path might be at the root of the destination directory, 
+	// If the destination directory ends with a slash, delete it.
+	// This is necessary to handle a situation where the entry path might be at the root of the destination directory,
 	// but in such a case "<destination-dir>/" is not a prefix of "<destination-dir>".
 	destinationDir = strings.TrimSuffix(destinationDir, string(os.PathSeparator))
 	walker, ok := archive.(archiver.Walker)