dilim/buildkit
1
0 Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-11-06 05:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: add unconvert

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi committed 2025-05-02 12:44:01 -07:00
1 parent 7e96e626e3
commit 69d3d44145
26 files changed
+53 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cache/blobs.go
Vendored
+6 -6
View File
@@ -351,7 +351,7 @@ func (sr *immutableRef) computeChainMetadata(ctx context.Context, filter map[str
}
diffID := sr.getDiffID()
chainID = diffID
blobChainID = imagespecidentity.ChainID([]digest.Digest{digest.Digest(sr.getBlob()), diffID})
blobChainID = imagespecidentity.ChainID([]digest.Digest{sr.getBlob(), diffID})
case Layer:
if _, ok := filter[sr.ID()]; !ok {
return nil
@@ -368,9 +368,9 @@ func (sr *immutableRef) computeChainMetadata(ctx context.Context, filter map[str
return errors.Errorf("failed to set blobchain for reference with non-addressable parent %q", sr.layerParent.GetDescription())
}
}
diffID := digest.Digest(sr.getDiffID())
diffID := sr.getDiffID()
chainID = imagespecidentity.ChainID([]digest.Digest{chainID, diffID})
blobID := imagespecidentity.ChainID([]digest.Digest{digest.Digest(sr.getBlob()), diffID})
blobID := imagespecidentity.ChainID([]digest.Digest{sr.getBlob(), diffID})
blobChainID = imagespecidentity.ChainID([]digest.Digest{blobChainID, blobID})
case Merge:
baseInput := sr.mergeParents[0]
@@ -386,9 +386,9 @@ func (sr *immutableRef) computeChainMetadata(ctx context.Context, filter map[str
// not enough information to compute chain at this time
return nil
}
diffID := digest.Digest(layer.getDiffID())
diffID := layer.getDiffID()
chainID = imagespecidentity.ChainID([]digest.Digest{chainID, diffID})
blobID := imagespecidentity.ChainID([]digest.Digest{digest.Digest(layer.getBlob()), diffID})
blobID := imagespecidentity.ChainID([]digest.Digest{layer.getBlob(), diffID})
blobChainID = imagespecidentity.ChainID([]digest.Digest{blobChainID, blobID})
}
}
@@ -397,7 +397,7 @@ func (sr *immutableRef) computeChainMetadata(ctx context.Context, filter map[str
// this diff is its own blob
diffID := sr.getDiffID()
chainID = diffID
blobChainID = imagespecidentity.ChainID([]digest.Digest{digest.Digest(sr.getBlob()), diffID})
blobChainID = imagespecidentity.ChainID([]digest.Digest{sr.getBlob(), diffID})
} else {
// re-using upper blob
chainID = sr.diffParents.upper.getChainID()
cache/contenthash/checksum.go
Vendored
+1 -1
View File
@@ -399,7 +399,7 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
for _, l := range links {
pp := convertKeyToPath(l)
cc.txn.Insert(l, cr)
d := path.Dir(string(pp))
d := path.Dir(pp)
if d == "/" {
d = ""
}
cache/manager_test.go
Vendored
+1 -1
View File
@@ -2807,7 +2807,7 @@ func mapToSystemTarBlob(t *testing.T, m map[string]string) ([]byte, ocispecs.Des
if err != nil {
return nil, ocispecs.Descriptor{}, err
}
if string(gotV) != string(v) {
if string(gotV) != v {
return nil, ocispecs.Descriptor{}, errors.Errorf("unexpected contents of %s", h.Name)
}
}
cache/migrate_v2.go
Vendored
+1 -1
View File
@@ -223,7 +223,7 @@ func MigrateV2(ctx context.Context, from, to string, cs content.Store, s snapsho
if blob := md.getBlob(); blob != "" {
if _, err := cs.Update(ctx, content.Info{
Digest: digest.Digest(blob),
Digest: blob,
}, "labels.containerd.io/gc.root"); err != nil {
return err
}
cache/refs.go
Vendored
+5 -5
View File
@@ -361,12 +361,12 @@ func (cr *cacheRecord) size(ctx context.Context) (int64, error) {
}
if dgst := cr.getBlob(); dgst != "" {
added := make(map[digest.Digest]struct{})
info, err := cr.cm.ContentStore.Info(ctx, digest.Digest(dgst))
info, err := cr.cm.ContentStore.Info(ctx, dgst)
if err == nil {
usage.Size += info.Size
added[digest.Digest(dgst)] = struct{}{}
added[dgst] = struct{}{}
}
walkBlobVariantsOnly(ctx, cr.cm.ContentStore, digest.Digest(dgst), func(desc ocispecs.Descriptor) bool {
walkBlobVariantsOnly(ctx, cr.cm.ContentStore, dgst, func(desc ocispecs.Descriptor) bool {
if _, ok := added[desc.Digest]; !ok {
if info, err := cr.cm.ContentStore.Info(ctx, desc.Digest); err == nil {
usage.Size += info.Size
@@ -1035,7 +1035,7 @@ func (sr *immutableRef) withRemoteSnapshotLabelsStargzMode(ctx context.Context,
} else if _, ok := info.Labels["containerd.io/snapshot/remote"]; !ok {
continue // This isn't a remote snapshot; skip
}
dh := dhs[digest.Digest(r.getBlob())]
dh := dhs[r.getBlob()]
if dh == nil {
continue // no info passed; skip
}
@@ -1075,7 +1075,7 @@ func (sr *immutableRef) prepareRemoteSnapshotsStargzMode(ctx context.Context, s
continue
}
dh := dhs[digest.Digest(r.getBlob())]
dh := dhs[r.getBlob()]
if dh == nil {
// We cannot prepare remote snapshots without descHandler.
return nil, nil
client/client_test.go
+1 -1
View File
@@ -11423,7 +11423,7 @@ func testLLBMountPerformance(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)
// Windows images take longer time
timeout := integration.UnixOrWindows(time.Duration(time.Minute), time.Duration(3*time.Minute))
timeout := integration.UnixOrWindows(time.Minute, 3*time.Minute)
timeoutCtx, cancel := context.WithTimeoutCause(sb.Context(), timeout, nil)
defer cancel()
_, err = c.Solve(timeoutCtx, def, SolveOpt{}, nil)
client/llb/definition.go
+1 -1
View File
@@ -240,7 +240,7 @@ func (d *DefinitionOp) Inputs() []Output {
d.mu.Unlock()
inputs = append(inputs, &output{vertex: vtx, platform: platform, getIndex: func() (pb.OutputIndex, error) {
return pb.OutputIndex(vtx.index), nil
return vtx.index, nil
}})
}
client/prune.go
+3 -3
View File
@@ -18,9 +18,9 @@ func (c *Client) Prune(ctx context.Context, ch chan UsageInfo, opts ...PruneOpti
req := &controlapi.PruneRequest{
Filter: info.Filter,
KeepDuration: int64(info.KeepDuration),
ReservedSpace: int64(info.ReservedSpace),
MaxUsedSpace: int64(info.MaxUsedSpace),
MinFreeSpace: int64(info.MinFreeSpace),
ReservedSpace: info.ReservedSpace,
MaxUsedSpace: info.MaxUsedSpace,
MinFreeSpace: info.MinFreeSpace,
}
if info.All {
req.All = true
client/solve.go
+1 -1
View File
@@ -356,7 +356,7 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
return nil, err
}
var manifestDesc ocispecs.Descriptor
if err = json.Unmarshal([]byte(manifestDescDt), &manifestDesc); err != nil {
if err = json.Unmarshal(manifestDescDt, &manifestDesc); err != nil {
return nil, err
}
for _, storePath := range storesToUpdate {
executor/resources/sampler.go
+1 -1
View File
@@ -122,7 +122,7 @@ func (s *Sampler[T]) run() {
ss.err = nil
}
dur := ss.last.Sub(ss.first)
if time.Duration(ss.interval)*time.Duration(s.maxSamples) <= dur {
if ss.interval*time.Duration(s.maxSamples) <= dur {
ss.interval *= 2
}
}
frontend/dockerfile/dockerfile_heredoc_test.go
+8 -8
View File
@@ -72,7 +72,7 @@ COPY --from=build /dest /
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -143,7 +143,7 @@ EOF
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -213,7 +213,7 @@ COPY --from=build /dest /dest
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -261,7 +261,7 @@ COPY --from=build /dest /dest
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -310,7 +310,7 @@ COPY --from=build /dest /dest
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -373,7 +373,7 @@ COPY --from=build /dest /
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -463,7 +463,7 @@ COPY --from=build /dest /
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -557,7 +557,7 @@ COPY --from=build /dest /
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
frontend/dockerfile/dockerfile_outline_test.go
+3 -3
View File
@@ -92,7 +92,7 @@ FROM second
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -197,7 +197,7 @@ FROM second
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
@@ -293,7 +293,7 @@ ARG INFOO=${INFOO}456${INBAR}
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
frontend/dockerfile/dockerfile_targets_test.go
+1 -1
View File
@@ -49,7 +49,7 @@ FROM second AS binary
dir := integration.Tmpdir(
t,
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
fstest.CreateFile("Dockerfile", dockerfile, 0600),
)
c, err := client.New(sb.Context(), sb.Address())
frontend/dockerfile/dockerfile_test.go
+1 -1
View File
@@ -9461,7 +9461,7 @@ COPY notexist /foo
}
err = grpcerrors.FromGRPC(status.FromProto(&statuspb.Status{
Code: int32(st.Code),
Code: st.Code,
Message: st.Message,
Details: details,
}).Err())
frontend/gateway/forwarder/forward.go
+1 -1
View File
@@ -59,7 +59,7 @@ type BridgeClient struct {
}
func (c *BridgeClient) Solve(ctx context.Context, req client.SolveRequest) (*client.Result, error) {
res, err := c.FrontendLLBBridge.Solve(ctx, frontend.SolveRequest(req), c.sid)
res, err := c.FrontendLLBBridge.Solve(ctx, req, c.sid)
if err != nil {
return nil, c.wrapSolveError(err)
}
frontend/gateway/gateway.go
+2 -2
View File
@@ -1572,7 +1572,7 @@ func (lbf *llbBridgeForwarder) ExecProcess(srv pb.LLBBridge_ExecProcessServer) e
}()
dest := &outputWriter{
stream: srv,
fd: uint32(fd),
fd: fd,
processID: pid,
}
_, err := io.Copy(dest, file)
@@ -1586,7 +1586,7 @@ func (lbf *llbBridgeForwarder) ExecProcess(srv pb.LLBBridge_ExecProcessServer) e
ProcessID: pid,
Input: &pb.ExecMessage_File{
File: &pb.FdMessage{
Fd: uint32(fd),
Fd: fd,
EOF: true,
},
},
solver/bboltcachestorage/storage.go
+3 -3
View File
@@ -307,8 +307,8 @@ func (s *Store) emptyBranchWithParents(tx *bolt.Tx, id []byte) error {
}
// intentionally ignoring errors
tx.Bucket([]byte(linksBucket)).DeleteBucket([]byte(id))
tx.Bucket([]byte(resultBucket)).DeleteBucket([]byte(id))
tx.Bucket([]byte(linksBucket)).DeleteBucket(id)
tx.Bucket([]byte(resultBucket)).DeleteBucket(id)
return nil
}
@@ -360,7 +360,7 @@ func (s *Store) WalkLinks(id string, link solver.CacheInfoLink, fn func(id strin
}
index := bytes.Join([][]byte{dt, {}}, []byte("@"))
c := b.Cursor()
k, _ := c.Seek([]byte(index))
k, _ := c.Seek(index)
for {
if k != nil && bytes.HasPrefix(k, index) {
target := bytes.TrimPrefix(k, index)
solver/cachemanager.go
+2 -2
View File
@@ -388,7 +388,7 @@ func (c *cacheManager) ensurePersistentKey(k *CacheKey) error {
for _, ck := range deps {
l := CacheInfoLink{
Input: Index(i),
Output: Index(k.Output()),
Output: k.Output(),
Digest: k.Digest(),
Selector: ck.Selector,
}
@@ -415,7 +415,7 @@ func (c *cacheManager) getIDFromDeps(k *CacheKey) string {
m2 := make(map[string]struct{})
if err := c.backend.WalkLinks(c.getID(ck.CacheKey.CacheKey), CacheInfoLink{
Input: Index(i),
Output: Index(k.Output()),
Output: k.Output(),
Digest: k.Digest(),
Selector: ck.Selector,
}, func(id string) error {
solver/llbsolver/bridge.go
+1 -1
View File
@@ -265,7 +265,7 @@ func (rp *resultProxy) wrapError(err error) error {
var ve *errdefs.VertexError
if errors.As(err, &ve) {
if rp.req.Definition.Source != nil {
locs, ok := rp.req.Definition.Source.Locations[string(ve.Digest)]
locs, ok := rp.req.Definition.Source.Locations[ve.Digest]
if ok {
for _, loc := range locs.Locations {
err = errdefs.WithSource(err, &errdefs.Source{
solver/llbsolver/history.go
+2 -2
View File
@@ -448,7 +448,7 @@ func (h *HistoryQueue) addResource(ctx context.Context, l leases.Lease, desc *co
return err
}
defer lr.Discard()
ok, err := h.migrateBlobV2(ctx, string(desc.Digest), detectSkipLayers)
ok, err := h.migrateBlobV2(ctx, desc.Digest, detectSkipLayers)
if err != nil {
return err
}
@@ -458,7 +458,7 @@ func (h *HistoryQueue) addResource(ctx context.Context, l leases.Lease, desc *co
}
}
return h.hLeaseManager.AddResource(ctx, l, leases.Resource{
ID: string(desc.Digest),
ID: desc.Digest,
Type: "content",
})
}
source/git/source_unix_nolinux.go
+3 -1
View File
@@ -4,6 +4,7 @@ package git
import (
"context"
"errors"
"os"
"os/exec"
"os/signal"
@@ -59,7 +60,8 @@ func gitMain() {
err := cmd.Run()
close(done)
if err != nil {
if exiterr, ok := err.(*exec.ExitError); ok {
exiterr := &exec.ExitError{}
if errors.As(err, &exiterr) {
switch status := exiterr.Sys().(type) {
case unix.WaitStatus:
os.Exit(status.ExitStatus())
source/http/source.go
+1 -1
View File
@@ -398,7 +398,7 @@ func (hs *httpSourceHandler) save(ctx context.Context, resp *http.Response, s se
uid := hs.src.UID
gid := hs.src.GID
if idmap := mount.IdentityMapping(); idmap != nil {
uid, gid, err = idmap.ToHost(int(uid), int(gid))
uid, gid, err = idmap.ToHost(uid, gid)
if err != nil {
return nil, "", err
}
util/disk/disk_freebsd.go
+1 -1
View File
@@ -17,6 +17,6 @@ func GetDiskStat(root string) (DiskStat, error) {
return DiskStat{
Total: int64(st.Bsize) * int64(st.Blocks),
Free: int64(st.Bsize) * int64(st.Bfree),
Available: int64(st.Bsize) * int64(st.Bavail),
Available: int64(st.Bsize) * st.Bavail,
}, nil
}
util/grpcerrors/grpcerrors_test.go
+1 -1
View File
@@ -38,7 +38,7 @@ func TestFromGRPCPreserveUnknownTypes(t *testing.T) {
assertErrorProperties := func(t *testing.T, err error) {
require.Error(t, err)
assert.Equal(t, fmt.Sprintf("%s: %s", codes.Code(errCode), errMessage), err.Error())
assert.Equal(t, fmt.Sprintf("%s: %s", errCode, errMessage), err.Error())
st, ok := status.FromError(err)
require.True(t, ok)
util/progress/logs/logs.go
+1 -1
View File
@@ -173,7 +173,7 @@ func LoggerFromContext(ctx context.Context) func([]byte) {
defer pw.Close()
pw.Write(identity.NewID(), client.VertexLog{
Stream: stderr,
Data: []byte(dt),
Data: dt,
})
}
}
util/progress/progressui/printer.go
+1 -1
View File
@@ -147,7 +147,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
l = l[v.logsOffset:]
fmt.Fprintf(p.w, "%s", l)
} else {
fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))
fmt.Fprintf(p.w, "#%d %s", v.index, l)
}
if i != len(v.logs)-1 || !v.logsPartial {