pkg/archive: move readCloserWrapper to be a test-utility

It's only used in tests now, so move it there, and simplify we can probably remove the atomic bool as well. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
moby · Dec 23, 2024 · 36e5b96 · 36e5b96
1 parent 97daaf5
commit 36e5b96
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -11,9 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"runtime/debug"
 	"strings"
-	"sync/atomic"
 	"syscall"
 	"time"
 
@@ -130,24 +128,6 @@ func DetectCompression(source []byte) compression.Compression {
 	return compression.Detect(source)
 }
 
-type readCloserWrapper struct {
-	io.Reader
-	closer func() error
-	closed atomic.Bool
-}
-
-func (r *readCloserWrapper) Close() error {
-	if !r.closed.CompareAndSwap(false, true) {
-		log.G(context.TODO()).Error("subsequent attempt to close readCloserWrapper")
-		if log.GetLevel() >= log.DebugLevel {
-			log.G(context.TODO()).Errorf("stack trace: %s", string(debug.Stack()))
-		}
-
-		return nil
-	}
-	return r.closer()
-}
-
 // DecompressStream decompresses the archive and returns a ReaderCloser with the decompressed archive.
 //
 // Deprecated: use [compression.DecompressStream].

diff --git a/pkg/archive/diff_test.go b/pkg/archive/diff_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"sync/atomic"
 	"testing"
 
 	"github.com/docker/docker/pkg/archive/compression"
@@ -310,6 +311,19 @@ func TestApplyLayerWhiteouts(t *testing.T) {
 	}
 }
 
+type readCloserWrapper struct {
+	io.Reader
+	closer func() error
+	closed atomic.Bool
+}
+
+func (r *readCloserWrapper) Close() error {
+	if !r.closed.CompareAndSwap(false, true) {
+		return nil
+	}
+	return r.closer()
+}
+
 func makeTestLayer(paths []string) (rc io.ReadCloser, err error) {
 	tmpDir, err := os.MkdirTemp("", "graphdriver-test-mklayer")
 	if err != nil {