Wrap file closer jfrog/closer

Wrap file closer

Author: sverdlov93

.github/workflows/analysis.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
         uses: actions/setup-go@v3
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
         uses: actions/setup-go@v3

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Go Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

io/fileutils.go

@@ -5,6 +5,7 @@ import (
 	cr "crypto/rand"
 	"errors"
 	"fmt"
+	"io"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -236,3 +237,10 @@ func GetFileInfo(path string, followSymlink bool) (fileInfo os.FileInfo, err err
 	// We should not do CheckError here, because the error is checked by the calling functions.
 	return fileInfo, err
 }
+
+// Close the reader/writer and append the error to the given error.
+func Close(closer io.Closer, err *error) {
+	if closeErr := closer.Close(); closeErr != nil {
+		*err = errors.Join(*err, fmt.Errorf("failed to close %T: %w", closer, closeErr))
+	}
+}

io/fileutils_test.go

@@ -0,0 +1,29 @@
+package io
+
+import (
+	"errors"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"path"
+	"strings"
+	"testing"
+)
+
+func TestClose(t *testing.T) {
+	var err error
+	t.TempDir()
+	f, err := os.Create(path.Join(t.TempDir(), "test"))
+	assert.NoError(t, err)
+
+	Close(f, &err)
+	assert.NoError(t, err)
+
+	// Try closing the same file again and expect error
+	Close(f, &err)
+	assert.Error(t, err)
+
+	// Check that both errors are aggregated
+	err = errors.New("original error")
+	Close(f, &err)
+	assert.Len(t, strings.Split(err.Error(), "\n"), 2)
+}