Browse Source

integration/build: Use fsutil.NewFS

StaticDirSource definition changed and can no longer be initialized from
the composite literal.

https://github.com/moby/buildkit/commits/a80b48544c029f0e28e1243407b55c916c7757f2

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Paweł Gronowski 1 year ago
parent
commit
e68f71259a
2 changed files with 6 additions and 2 deletions
  1. 5 1
      integration/build/build_session_test.go
  2. 1 1
      vendor.mod

+ 5 - 1
integration/build/build_session_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/docker/docker/testutil/request"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/filesync"
+	"github.com/tonistiigi/fsutil"
 	"golang.org/x/sync/errgroup"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
@@ -95,8 +96,11 @@ func testBuildWithSession(ctx context.Context, t *testing.T, client dclient.APIC
 	sess, err := session.NewSession(ctx, "foo1", "foo")
 	assert.Check(t, err)
 
+	fs, err := fsutil.NewFS(dir)
+	assert.NilError(t, err)
+
 	fsProvider := filesync.NewFSSyncProvider(filesync.StaticDirSource{
-		"": {Dir: dir},
+		"": fs,
 	})
 	sess.Allow(fsProvider)
 

+ 1 - 1
vendor.mod

@@ -87,6 +87,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
+	github.com/tonistiigi/fsutil v0.0.0-20240223190444-7a889f53dbf6
 	github.com/tonistiigi/go-archvariant v1.0.0
 	github.com/vbatts/tar-split v0.11.5
 	github.com/vishvananda/netlink v1.2.1-beta.2
@@ -186,7 +187,6 @@ require (
 	github.com/spdx/tools-golang v0.5.1 // 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-20240223190444-7a889f53dbf6 // indirect
 	github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7 // indirect
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
 	github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect