Merge pull request moby#48628 from thaJeztah/integration_remove_TestB…

…uildWithSession integration/build: remove TestBuildWithSession, and fsutil direct dependency
laurazard · Oct 10, 2024 · 810c7c1 · 810c7c1
2 parents eacb99d + 7fa6d3c
commit 810c7c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 142 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -83,6 +83,8 @@ linters-settings:
             desc: Use github.com/moby/sys/userns instead.
           - pkg: "github.com/opencontainers/runc/libcontainer/userns"
             desc: Use github.com/moby/sys/userns instead.
+          - pkg: "github.com/tonistiigi/fsutil"
+            desc: The fsutil module does not have a stable API, so we should not have a direct dependency unless necessary.
   revive:
     rules:
       # FIXME make sure all packages have a description. Currently, there's many packages without.

diff --git a/integration/build/build_session_test.go b/integration/build/build_session_test.go
diff --git a/vendor.mod b/vendor.mod
@@ -91,7 +91,6 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
-	github.com/tonistiigi/fsutil v0.0.0-20240424095704-91a3fc46842c
 	github.com/tonistiigi/go-archvariant v1.0.0
 	github.com/vbatts/tar-split v0.11.5
 	github.com/vishvananda/netlink v1.3.0
@@ -196,6 +195,7 @@ require (
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/tinylib/msgp v1.1.8 // indirect
+	github.com/tonistiigi/fsutil v0.0.0-20240424095704-91a3fc46842c // indirect
 	github.com/tonistiigi/go-actions-cache v0.0.0-20240327122527-58651d5e11d6 // indirect
 	github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect