chore: tidy up duplicated imports

Signed-off-by: Justin Chadwell <[email protected]> Signed-off-by: Moe Ghanem <[email protected]>
moby · Apr 27, 2023 · 543a021 · 543a021
1 parent 37f79e5
commit 543a021
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/client/client_test.go b/client/client_test.go
@@ -50,7 +50,6 @@ import (
 	"github.com/moby/buildkit/solver/result"
 	"github.com/moby/buildkit/sourcepolicy"
 	sourcepolicypb "github.com/moby/buildkit/sourcepolicy/pb"
-	spb "github.com/moby/buildkit/sourcepolicy/pb"
 	"github.com/moby/buildkit/util/attestation"
 	"github.com/moby/buildkit/util/contentutil"
 	"github.com/moby/buildkit/util/entitlements"
@@ -9087,11 +9086,11 @@ func testSourcePolicy(t *testing.T, sb integration.Sandbox) {
 			}
 			return c.Solve(ctx, gateway.SolveRequest{
 				Definition: def.ToPB(),
-				SourcePolicies: []*spb.Policy{{
-					Rules: []*spb.Rule{
+				SourcePolicies: []*sourcepolicypb.Policy{{
+					Rules: []*sourcepolicypb.Rule{
 						{
-							Action: spb.PolicyAction_DENY,
-							Selector: &spb.Selector{
+							Action: sourcepolicypb.PolicyAction_DENY,
+							Selector: &sourcepolicypb.Selector{
 								Identifier: denied,
 							},
 						},

diff --git a/util/winlayers/differ.go b/util/winlayers/differ.go
@@ -15,12 +15,10 @@ import (
 	"github.com/containerd/containerd/diff"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
+	log "github.com/moby/buildkit/util/bklog"
 	digest "github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-
-	"github.com/moby/buildkit/util/bklog"
-	log "github.com/moby/buildkit/util/bklog"
 )
 
 const (
@@ -259,7 +257,7 @@ func makeWindowsLayer(ctx context.Context, w io.Writer) (io.Writer, func(error),
 			return tarWriter.Close()
 		}()
 		if err != nil {
-			bklog.G(ctx).Errorf("makeWindowsLayer %+v", err)
+			log.G(ctx).Errorf("makeWindowsLayer %+v", err)
 		}
 		pw.CloseWithError(err)
 		done <- err