From aae26b80fe423387da4ef7df16855ab3c75afd5b Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 2 Jul 2025 15:50:11 -0700 Subject: [PATCH] Remove client buildkit dep Remove unused package from client which brings in buildkit dep Signed-off-by: Derek McGowan --- client/buildkit/buildkit.go | 27 -------------------------- integration/build/build_traces_test.go | 12 ++++++++++-- 2 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 client/buildkit/buildkit.go diff --git a/client/buildkit/buildkit.go b/client/buildkit/buildkit.go deleted file mode 100644 index 4c18ca5086..0000000000 --- a/client/buildkit/buildkit.go +++ /dev/null @@ -1,27 +0,0 @@ -package buildkit - -import ( - "context" - "net" - - "github.com/docker/docker/client" - bkclient "github.com/moby/buildkit/client" -) - -// ClientOpts returns a list of buildkit client options which allows the -// caller to create a buildkit client which will connect to the buildkit -// API provided by the daemon. These options can be passed to [bkclient.New]. -// -// Example: -// -// bkclient.New(ctx, "", ClientOpts(c)...) -func ClientOpts(c client.HijackDialer) []bkclient.ClientOpt { - return []bkclient.ClientOpt{ - bkclient.WithSessionDialer(func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) { - return c.DialHijack(ctx, "/session", proto, meta) - }), - bkclient.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) { - return c.DialHijack(ctx, "/grpc", "h2c", nil) - }), - } -} diff --git a/integration/build/build_traces_test.go b/integration/build/build_traces_test.go index 7ca9c211fe..deb38ade8a 100644 --- a/integration/build/build_traces_test.go +++ b/integration/build/build_traces_test.go @@ -3,10 +3,10 @@ package build import ( "context" "errors" + "net" "testing" "time" - "github.com/docker/docker/client/buildkit" "github.com/docker/docker/testutil" moby_buildkit_v1 "github.com/moby/buildkit/api/services/control" "github.com/moby/buildkit/client" @@ -33,7 +33,15 @@ func TestBuildkitHistoryTracePropagation(t *testing.T) { ctx := testutil.StartSpan(baseContext, t) - opts := buildkit.ClientOpts(testEnv.APIClient()) + c := testEnv.APIClient() + opts := []client.ClientOpt{ + client.WithSessionDialer(func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) { + return c.DialHijack(ctx, "/session", proto, meta) + }), + client.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) { + return c.DialHijack(ctx, "/grpc", "h2c", nil) + }), + } bc, err := client.New(ctx, "", opts...) assert.NilError(t, err) defer bc.Close()