-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request moby#33859 from tonistiigi/session-includepaths
Add path filtering to build session client
- Loading branch information
Showing
8 changed files
with
187 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package filesync | ||
|
|
||
| import ( | ||
| "context" | ||
| "io/ioutil" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/docker/docker/client/session" | ||
| "github.com/docker/docker/client/session/testutil" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "golang.org/x/sync/errgroup" | ||
| ) | ||
|
|
||
| func TestFileSyncIncludePatterns(t *testing.T) { | ||
| tmpDir, err := ioutil.TempDir("", "fsynctest") | ||
| require.NoError(t, err) | ||
|
|
||
| destDir, err := ioutil.TempDir("", "fsynctest") | ||
| require.NoError(t, err) | ||
|
|
||
| err = ioutil.WriteFile(filepath.Join(tmpDir, "foo"), []byte("content1"), 0600) | ||
| require.NoError(t, err) | ||
|
|
||
| err = ioutil.WriteFile(filepath.Join(tmpDir, "bar"), []byte("content2"), 0600) | ||
| require.NoError(t, err) | ||
|
|
||
| s, err := session.NewSession("foo", "bar") | ||
| require.NoError(t, err) | ||
|
|
||
| m, err := session.NewManager() | ||
| require.NoError(t, err) | ||
|
|
||
| fs := NewFSSyncProvider(tmpDir, nil) | ||
| s.Allow(fs) | ||
|
|
||
| dialer := session.Dialer(testutil.TestStream(testutil.Handler(m.HandleConn))) | ||
|
|
||
| g, ctx := errgroup.WithContext(context.Background()) | ||
|
|
||
| g.Go(func() error { | ||
| return s.Run(ctx, dialer) | ||
| }) | ||
|
|
||
| g.Go(func() (reterr error) { | ||
| c, err := m.Get(ctx, s.UUID()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if err := FSSync(ctx, c, FSSendRequestOpt{ | ||
| DestDir: destDir, | ||
| IncludePatterns: []string{"ba*"}, | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = ioutil.ReadFile(filepath.Join(destDir, "foo")) | ||
| assert.Error(t, err) | ||
|
|
||
| dt, err := ioutil.ReadFile(filepath.Join(destDir, "bar")) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| assert.Equal(t, "content2", string(dt)) | ||
| return s.Close() | ||
| }) | ||
|
|
||
| err = g.Wait() | ||
| require.NoError(t, err) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package testutil | ||
|
|
||
| import ( | ||
| "io" | ||
| "net" | ||
| "time" | ||
|
|
||
| "github.com/Sirupsen/logrus" | ||
| "golang.org/x/net/context" | ||
| ) | ||
|
|
||
| // Handler is function called to handle incoming connection | ||
| type Handler func(ctx context.Context, conn net.Conn, meta map[string][]string) error | ||
|
|
||
| // Dialer is a function for dialing an outgoing connection | ||
| type Dialer func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) | ||
|
|
||
| // TestStream creates an in memory session dialer for a handler function | ||
| func TestStream(handler Handler) Dialer { | ||
| s1, s2 := sockPair() | ||
| return func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) { | ||
| go func() { | ||
| err := handler(context.TODO(), s1, meta) | ||
| if err != nil { | ||
| logrus.Error(err) | ||
| } | ||
| s1.Close() | ||
| }() | ||
| return s2, nil | ||
| } | ||
| } | ||
|
|
||
| func sockPair() (*sock, *sock) { | ||
| pr1, pw1 := io.Pipe() | ||
| pr2, pw2 := io.Pipe() | ||
| return &sock{pw1, pr2, pw1}, &sock{pw2, pr1, pw2} | ||
| } | ||
|
|
||
| type sock struct { | ||
| io.Writer | ||
| io.Reader | ||
| io.Closer | ||
| } | ||
|
|
||
| func (s *sock) LocalAddr() net.Addr { | ||
| return dummyAddr{} | ||
| } | ||
| func (s *sock) RemoteAddr() net.Addr { | ||
| return dummyAddr{} | ||
| } | ||
| func (s *sock) SetDeadline(t time.Time) error { | ||
| return nil | ||
| } | ||
| func (s *sock) SetReadDeadline(t time.Time) error { | ||
| return nil | ||
| } | ||
| func (s *sock) SetWriteDeadline(t time.Time) error { | ||
| return nil | ||
| } | ||
|
|
||
| type dummyAddr struct { | ||
| } | ||
|
|
||
| func (d dummyAddr) Network() string { | ||
| return "tcp" | ||
| } | ||
|
|
||
| func (d dummyAddr) String() string { | ||
| return "localhost" | ||
| } |