Skip to content

Commit

Permalink
all: remove duplicate imports
Browse files Browse the repository at this point in the history
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
  • Loading branch information
zchee committed Jul 25, 2021
1 parent b2195ce commit 613ca65
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions cache/remotecache/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/resolver/limited"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -94,7 +93,7 @@ func (dsl *withDistributionSourceLabel) SetDistributionSourceLabel(ctx context.C
if err != nil {
return err
}
_, err = hf(ctx, ocispec.Descriptor{Digest: dgst})
_, err = hf(ctx, specs.Descriptor{Digest: dgst})
return err
}

Expand Down
3 changes: 1 addition & 2 deletions cmd/buildkitd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/trace"
tracev1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
v1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
)
Expand Down Expand Up @@ -805,5 +804,5 @@ func (t *traceCollector) Export(ctx context.Context, req *tracev1.ExportTraceSer
if err != nil {
return nil, err
}
return &v1.ExportTraceServiceResponse{}, nil
return &tracev1.ExportTraceServiceResponse{}, nil
}
3 changes: 1 addition & 2 deletions control/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/pkg/errors"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
tracev1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
v1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -203,7 +202,7 @@ func (c *Controller) Export(ctx context.Context, req *tracev1.ExportTraceService
if err != nil {
return nil, err
}
return &v1.ExportTraceServiceResponse{}, nil
return &tracev1.ExportTraceServiceResponse{}, nil
}

func translateLegacySolveRequest(req *controlapi.SolveRequest) error {
Expand Down

0 comments on commit 613ca65

Please sign in to comment.