Fix lint issues

google.golang.org/protobuf made all proto structs with a mutex to prevent copies. Signed-off-by: Kazuyoshi Kato <[email protected]>
moby · Jan 20, 2024 · 68d8112 · 68d8112
1 parent 6bdaa2a
commit 68d8112
Show file tree

Hide file tree

Showing 43 changed files with 194 additions and 163 deletions.
diff --git a/cache/contenthash/checksum.go b/cache/contenthash/checksum.go
@@ -372,8 +372,12 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
 		ln := path.Join("/", filepath.ToSlash(stat.Linkname))
 		v, ok := cc.txn.Get(convertPathToKey([]byte(ln)))
 		if ok {
-			cp := *v.(*CacheRecord)
-			cr = &cp
+			cp := v.(*CacheRecord)
+			cr = &CacheRecord{
+				Digest:   cp.Digest,
+				Type:     cp.Type,
+				Linkname: cp.Linkname,
+			}
 		}
 		cc.linkMap[ln] = append(cc.linkMap[ln], k)
 	}

diff --git a/client/llb/definition.go b/client/llb/definition.go
@@ -21,7 +21,7 @@ type DefinitionOp struct {
 	mu         sync.Mutex
 	ops        map[digest.Digest]*pb.Op
 	defs       map[digest.Digest][]byte
-	metas      map[digest.Digest]pb.OpMetadata
+	metas      map[digest.Digest]*pb.OpMetadata
 	sources    map[digest.Digest][]*SourceLocation
 	platforms  map[digest.Digest]*ocispecs.Platform
 	dgst       digest.Digest
@@ -101,7 +101,7 @@ func NewDefinitionOp(def *pb.Definition) (*DefinitionOp, error) {
 	return &DefinitionOp{
 		ops:        ops,
 		defs:       defs,
-		metas:      util.FromPointerMap[digest.Digest](def.Metadata),
+		metas:      util.FromStringMap[digest.Digest](def.Metadata),
 		sources:    srcs,
 		platforms:  platforms,
 		dgst:       dgst,
@@ -168,7 +168,7 @@ func (d *DefinitionOp) Marshal(ctx context.Context, c *Constraints) (digest.Dige
 	defer d.mu.Unlock()
 
 	meta := d.metas[d.dgst]
-	return d.dgst, d.defs[d.dgst], &meta, d.sources[d.dgst], nil
+	return d.dgst, d.defs[d.dgst], meta, d.sources[d.dgst], nil
 }
 
 func (d *DefinitionOp) Output() Output {

diff --git a/client/llb/fileop_test.go b/client/llb/fileop_test.go
@@ -693,24 +693,24 @@ func TestFileCreatedTime(t *testing.T) {
 	require.Equal(t, dt3.UnixNano(), copy.Timestamp)
 }
 
-func parseDef(t *testing.T, def [][]byte) (map[digest.Digest]pb.Op, []pb.Op) {
-	m := map[digest.Digest]pb.Op{}
-	arr := make([]pb.Op, 0, len(def))
+func parseDef(t *testing.T, def [][]byte) (map[digest.Digest]*pb.Op, []*pb.Op) {
+	m := map[digest.Digest]*pb.Op{}
+	arr := make([]*pb.Op, 0, len(def))
 
 	for _, dt := range def {
 		var op pb.Op
 		err := proto.Unmarshal(dt, &op)
 		require.NoError(t, err)
 		dgst := digest.FromBytes(dt)
-		m[dgst] = op
-		arr = append(arr, op)
+		m[dgst] = &op
+		arr = append(arr, &op)
 		// fmt.Printf(":: %T %+v\n", op.Op, op)
 	}
 
 	return m, arr
 }
 
-func last(t *testing.T, arr []pb.Op) (digest.Digest, int) {
+func last(t *testing.T, arr []*pb.Op) (digest.Digest, int) {
 	require.True(t, len(arr) > 1)
 
 	op := arr[len(arr)-1]

diff --git a/client/llb/llbbuild/llbbuild.go b/client/llb/llbbuild/llbbuild.go
@@ -62,6 +62,9 @@ func (b *build) Marshal(ctx context.Context, c *llb.Constraints) (digest.Digest,
 		pbo.Attrs[pb.AttrLLBDefinitionFilename] = b.info.DefinitionFilename
 	}
 
+	if b.constraints.Metadata == nil {
+		b.constraints.Metadata = &pb.OpMetadata{}
+	}
 	if b.constraints.Metadata.Caps == nil {
 		b.constraints.Metadata.Caps = make(map[string]bool)
 	}

diff --git a/client/llb/llbtest/platform_test.go b/client/llb/llbtest/platform_test.go
@@ -186,7 +186,7 @@ func toOp(e solver.Edge) *pb.Op {
 
 func platform(e solver.Edge) ocispecs.Platform {
 	op := toOp(e)
-	p := *op.Platform
+	p := op.Platform
 	return ocispecs.Platform{
 		OS:           p.OS,
 		Architecture: p.Architecture,

diff --git a/client/llb/marshal.go b/client/llb/marshal.go
@@ -89,8 +89,8 @@ func MarshalConstraints(base, override *Constraints) (*pb.Op, *pb.OpMetadata) {
 	}
 
 	c.WorkerConstraints = append(c.WorkerConstraints, override.WorkerConstraints...)
-	md := mergeMetadata(&c.Metadata, &override.Metadata)
-	c.Metadata = *md
+	md := mergeMetadata(c.Metadata, override.Metadata)
+	c.Metadata = md
 
 	if c.Platform == nil {
 		defaultPlatform := platforms.Normalize(platforms.DefaultSpec())
@@ -112,7 +112,7 @@ func MarshalConstraints(base, override *Constraints) (*pb.Op, *pb.OpMetadata) {
 		Constraints: &pb.WorkerConstraints{
 			Filter: c.WorkerConstraints,
 		},
-	}, &c.Metadata
+	}, c.Metadata
 }
 
 type MarshalCache struct {

diff --git a/client/llb/meta.go b/client/llb/meta.go
@@ -261,7 +261,7 @@ func ulimit(name UlimitName, soft int64, hard int64) StateOption {
 			if err != nil {
 				return nil, err
 			}
-			return append(v, pb.Ulimit{
+			return append(v, &pb.Ulimit{
 				Name: string(name),
 				Soft: soft,
 				Hard: hard,
@@ -270,14 +270,14 @@ func ulimit(name UlimitName, soft int64, hard int64) StateOption {
 	}
 }
 
-func getUlimit(s State) func(context.Context, *Constraints) ([]pb.Ulimit, error) {
-	return func(ctx context.Context, c *Constraints) ([]pb.Ulimit, error) {
+func getUlimit(s State) func(context.Context, *Constraints) ([]*pb.Ulimit, error) {
+	return func(ctx context.Context, c *Constraints) ([]*pb.Ulimit, error) {
 		v, err := s.getValue(keyUlimit)(ctx, c)
 		if err != nil {
 			return nil, err
 		}
 		if v != nil {
-			return v.([]pb.Ulimit), nil
+			return v.([]*pb.Ulimit), nil
 		}
 		return nil, nil
 	}

diff --git a/client/llb/source.go b/client/llb/source.go
@@ -640,6 +640,9 @@ func platformSpecificSource(id string) bool {
 }
 
 func addCap(c *Constraints, id apicaps.CapID) {
+	if c.Metadata == nil {
+		c.Metadata = &pb.OpMetadata{}
+	}
 	if c.Metadata.Caps == nil {
 		c.Metadata.Caps = make(map[string]bool)
 	}

diff --git a/client/llb/state.go b/client/llb/state.go
@@ -567,6 +567,12 @@ func (fn constraintsOptFunc) SetGitOption(gi *GitInfo) {
 }
 
 func mergeMetadata(m1, m2 *pb.OpMetadata) *pb.OpMetadata {
+	if m1 == nil {
+		m1 = &pb.OpMetadata{}
+	}
+	if m2 == nil {
+		m2 = &pb.OpMetadata{}
+	}
 	if m2.IgnoreCache {
 		m1.IgnoreCache = true
 	}
@@ -597,11 +603,17 @@ func mergeMetadata(m1, m2 *pb.OpMetadata) *pb.OpMetadata {
 }
 
 var IgnoreCache = constraintsOptFunc(func(c *Constraints) {
+	if c.Metadata == nil {
+		c.Metadata = &pb.OpMetadata{}
+	}
 	c.Metadata.IgnoreCache = true
 })
 
 func WithDescription(m map[string]string) ConstraintsOpt {
 	return constraintsOptFunc(func(c *Constraints) {
+		if c.Metadata == nil {
+			c.Metadata = &pb.OpMetadata{}
+		}
 		if c.Metadata.Description == nil {
 			c.Metadata.Description = map[string]string{}
 		}
@@ -624,6 +636,9 @@ func WithCustomNamef(name string, a ...interface{}) ConstraintsOpt {
 // WithExportCache forces results for this vertex to be exported with the cache
 func WithExportCache() ConstraintsOpt {
 	return constraintsOptFunc(func(c *Constraints) {
+		if c.Metadata == nil {
+			c.Metadata = &pb.OpMetadata{}
+		}
 		c.Metadata.ExportCache = &pb.ExportCache{Value: true}
 	})
 }
@@ -632,6 +647,9 @@ func WithExportCache() ConstraintsOpt {
 // the cache
 func WithoutExportCache() ConstraintsOpt {
 	return constraintsOptFunc(func(c *Constraints) {
+		if c.Metadata == nil {
+			c.Metadata = &pb.OpMetadata{}
+		}
 		// ExportCache with value false means to disable exporting
 		c.Metadata.ExportCache = &pb.ExportCache{Value: false}
 	})
@@ -641,6 +659,9 @@ func WithoutExportCache() ConstraintsOpt {
 // the default defined by the build configuration.
 func WithoutDefaultExportCache() ConstraintsOpt {
 	return constraintsOptFunc(func(c *Constraints) {
+		if c.Metadata == nil {
+			c.Metadata = &pb.OpMetadata{}
+		}
 		// nil means no vertex based config has been set
 		c.Metadata.ExportCache = nil
 	})
@@ -664,7 +685,7 @@ func (cw *constraintsWrapper) applyConstraints(f func(c *Constraints)) {
 type Constraints struct {
 	Platform          *ocispecs.Platform
 	WorkerConstraints []string
-	Metadata          pb.OpMetadata
+	Metadata          *pb.OpMetadata
 	LocalUniqueID     string
 	Caps              *apicaps.CapSet
 	SourceLocations   []*SourceLocation
@@ -684,6 +705,9 @@ func LocalUniqueID(v string) ConstraintsOpt {
 
 func ProgressGroup(id, name string, weak bool) ConstraintsOpt {
 	return constraintsOptFunc(func(c *Constraints) {
+		if c.Metadata == nil {
+			c.Metadata = &pb.OpMetadata{}
+		}
 		c.Metadata.ProgressGroup = &pb.ProgressGroup{Id: id, Name: name, Weak: weak}
 	})
 }

diff --git a/client/workers.go b/client/workers.go
@@ -7,7 +7,6 @@ import (
 	controlapi "github.com/moby/buildkit/api/services/control"
 	apitypes "github.com/moby/buildkit/api/types"
 	"github.com/moby/buildkit/solver/pb"
-	"github.com/moby/buildkit/util"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )
@@ -40,7 +39,7 @@ func (c *Client) ListWorkers(ctx context.Context, opts ...ListWorkersOption) ([]
 		wi = append(wi, &WorkerInfo{
 			ID:              w.ID,
 			Labels:          w.Labels,
-			Platforms:       pb.ToSpecPlatforms(util.FromPointerSlice(w.Platforms)),
+			Platforms:       pb.ToSpecPlatforms(w.Platforms),
 			GCPolicy:        fromAPIGCPolicy(w.GCPolicy),
 			BuildkitVersion: fromAPIBuildkitVersion(w.BuildkitVersion),
 		})

diff --git a/cmd/buildctl/build.go b/cmd/buildctl/build.go
@@ -134,9 +134,9 @@ func read(r io.Reader, clicontext *cli.Context) (*llb.Definition, error) {
 			if !ok {
 				opMetadata = &pb.OpMetadata{}
 			}
-			c := llb.Constraints{Metadata: *opMetadata}
+			c := llb.Constraints{Metadata: opMetadata}
 			llb.IgnoreCache(&c)
-			def.Metadata[dgst] = &c.Metadata
+			def.Metadata[dgst] = c.Metadata
 		}
 	}
 	return def, nil

diff --git a/cmd/buildctl/debug/dumpllb.go b/cmd/buildctl/debug/dumpllb.go
@@ -58,9 +58,9 @@ func dumpLLB(clicontext *cli.Context) error {
 }
 
 type llbOp struct {
-	Op         pb.Op
+	Op         *pb.Op
 	Digest     digest.Digest
-	OpMetadata pb.OpMetadata
+	OpMetadata *pb.OpMetadata
 }
 
 func loadLLB(r io.Reader) ([]llbOp, error) {
@@ -75,7 +75,7 @@ func loadLLB(r io.Reader) ([]llbOp, error) {
 			return nil, errors.Wrap(err, "failed to parse op")
 		}
 		dgst := digest.FromBytes(dt)
-		ent := llbOp{Op: op, Digest: dgst, OpMetadata: *def.Metadata[dgst]}
+		ent := llbOp{Op: &op, Digest: dgst, OpMetadata: def.Metadata[dgst]}
 		ops = append(ops, ent)
 	}
 	return ops, nil
@@ -104,7 +104,7 @@ func writeDot(ops []llbOp, w io.Writer) {
 	}
 }
 
-func attr(dgst digest.Digest, op pb.Op) (string, string) {
+func attr(dgst digest.Digest, op *pb.Op) (string, string) {
 	switch op := op.Op.(type) {
 	case *pb.Op_Source:
 		return op.Source.Identifier, "ellipse"

diff --git a/control/control.go b/control/control.go
@@ -542,7 +542,7 @@ func (c *Controller) ListWorkers(ctx context.Context, r *controlapi.ListWorkersR
 		resp.Record = append(resp.Record, &apitypes.WorkerRecord{
 			ID:              w.ID(),
 			Labels:          w.Labels(),
-			Platforms:       util.PointerSlice(pb.PlatformsFromSpec(w.Platforms(true))),
+			Platforms:       pb.PlatformsFromSpec(w.Platforms(true)),
 			GCPolicy:        toPBGCPolicy(w.GCPolicy()),
 			BuildkitVersion: toPBBuildkitVersion(w.BuildkitVersion()),
 		})
@@ -646,7 +646,7 @@ func findDuplicateCacheOptions(cacheOpts []*controlapi.CacheOptionsEntry) ([]*co
 	seen := map[string]*controlapi.CacheOptionsEntry{}
 	duplicate := map[string]struct{}{}
 	for _, opt := range cacheOpts {
-		k, err := cacheOptKey(*opt)
+		k, err := cacheOptKey(opt)
 		if err != nil {
 			return nil, err
 		}
@@ -663,7 +663,7 @@ func findDuplicateCacheOptions(cacheOpts []*controlapi.CacheOptionsEntry) ([]*co
 	return duplicates, nil
 }
 
-func cacheOptKey(opt controlapi.CacheOptionsEntry) (string, error) {
+func cacheOptKey(opt *controlapi.CacheOptionsEntry) (string, error) {
 	if opt.Type == "registry" && opt.Attrs["ref"] != "" {
 		return opt.Attrs["ref"], nil
 	}

diff --git a/exporter/local/fs.go b/exporter/local/fs.go
@@ -196,7 +196,7 @@ func CreateFS(ctx context.Context, sessionID string, k string, ref cache.Immutab
 			}
 			names[name] = struct{}{}
 
-			st := fstypes.Stat{
+			st := &fstypes.Stat{
 				Mode:    0600,
 				Path:    name,
 				ModTime: defaultTime.UnixNano(),

diff --git a/frontend/dockerfile/builder/build.go b/frontend/dockerfile/builder/build.go
@@ -275,5 +275,5 @@ func wrapSource(err error, sm *llb.SourceMap, ranges []parser.Range) error {
 			},
 		})
 	}
-	return errdefs.WithSource(err, s)
+	return errdefs.WithSource(err, &s)
 }
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -682,7 +682,7 @@ type dispatchOpt struct {
 	buildPlatforms    []ocispecs.Platform
 	extraHosts        []llb.HostIP
 	shmSize           int64
-	ulimit            []pb.Ulimit
+	ulimit            []*pb.Ulimit
 	cgroupParent      string
 	llbCaps           *apicaps.CapSet
 	sourceMap         *llb.SourceMap

diff --git a/frontend/dockerui/attr.go b/frontend/dockerui/attr.go
@@ -75,11 +75,11 @@ func parseShmSize(v string) (int64, error) {
 	return kb, nil
 }
 
-func parseUlimits(v string) ([]pb.Ulimit, error) {
+func parseUlimits(v string) ([]*pb.Ulimit, error) {
 	if v == "" {
 		return nil, nil
 	}
-	out := make([]pb.Ulimit, 0)
+	out := make([]*pb.Ulimit, 0)
 	csvReader := csv.NewReader(strings.NewReader(v))
 	fields, err := csvReader.Read()
 	if err != nil {
@@ -90,7 +90,7 @@ func parseUlimits(v string) ([]pb.Ulimit, error) {
 		if err != nil {
 			return nil, err
 		}
-		out = append(out, pb.Ulimit{
+		out = append(out, &pb.Ulimit{
 			Name: ulimit.Name,
 			Soft: ulimit.Soft,
 			Hard: ulimit.Hard,

diff --git a/frontend/dockerui/config.go b/frontend/dockerui/config.go
@@ -63,7 +63,7 @@ type Config struct {
 	NetworkMode      pb.NetMode
 	ShmSize          int64
 	Target           string
-	Ulimits          []pb.Ulimit
+	Ulimits          []*pb.Ulimit
 
 	CacheImports           []client.CacheOptionsEntry
 	TargetPlatforms        []ocispecs.Platform // nil means default
@@ -218,7 +218,7 @@ func (bc *Client) init() error {
 	var cacheImports []client.CacheOptionsEntry
 	// new API
 	if cacheImportsStr := opts[keyCacheImports]; cacheImportsStr != "" {
-		var cacheImportsUM []controlapi.CacheOptionsEntry
+		var cacheImportsUM []*controlapi.CacheOptionsEntry
 		if err := json.Unmarshal([]byte(cacheImportsStr), &cacheImportsUM); err != nil {
 			return errors.Wrapf(err, "failed to unmarshal %s (%q)", keyCacheImports, cacheImportsStr)
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			},
     		})
     	}
-    	return errdefs.WithSource(err, s)
+    	return errdefs.WithSource(err, &s)
     }