Merge pull request #2248 from thaJeztah/modernize

modernize some code

Author: ktock

analyzer/analyzer.go

@@ -157,7 +157,7 @@ func Analyze(ctx context.Context, client *containerd.Client, ref string, opts ..
 
 	// Create the container and the task
 	var container containerd.Container
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		id := xid.New().String()
 		var s runtimespec.Spec
 		container, err = client.NewContainer(ctx, id,
@@ -221,8 +221,8 @@ func Analyze(ctx context.Context, client *containerd.Client, ref string, opts ..
 		prePaths := preMonitor.GetPaths()
 		for _, path := range prePaths {
 			cleanPath := path
-			if strings.HasPrefix(path, target) {
-				cleanPath = strings.TrimPrefix(path, target)
+			if after, ok := strings.CutPrefix(path, target); ok {
+				cleanPath = after
 			}
 			if err := rc.Record(cleanPath); err != nil {
 				log.G(ctx).WithError(err).Debugf("failed to record pre-container path %q", cleanPath)

analyzer/recorder/recorder.go

@@ -80,7 +80,6 @@ func imageRecorderFromManifest(ctx context.Context, cs content.Store, manifestDe
 	var eg errgroup.Group
 	filesMap := make([]map[string]struct{}, len(manifest.Layers))
 	for i, desc := range manifest.Layers {
-		i, desc := i, desc
 		filesMap[i] = make(map[string]struct{})
 
 		// Create the index from the layer blob.

analyzer/recorder/recorder_test.go

@@ -217,7 +217,6 @@ func TestNodeIndex(t *testing.T) {
 	ctx := context.Background()
 	for _, tt := range tests {
 		for _, prefix := range allowedPrefix {
-			prefix := prefix
 			for mediatype, cWrapper := range compressWrappers {
 				t.Run(tt.name+":"+mediatype+",prefix="+prefix, func(t *testing.T) {
 					var layers []ocispec.Descriptor

cache/cache.go

@@ -134,7 +134,7 @@ func NewDirectoryCache(directory string, config DirectoryCacheConfig) (BlobCache
 	bufPool := config.BufPool
 	if bufPool == nil {
 		bufPool = &sync.Pool{
-			New: func() interface{} {
+			New: func() any {
 				return new(bytes.Buffer)
 			},
 		}
@@ -146,7 +146,7 @@ func NewDirectoryCache(directory string, config DirectoryCacheConfig) (BlobCache
 			maxEntry = defaultMaxLRUCacheEntry
 		}
 		dataCache = cacheutil.NewLRUCache(maxEntry)
-		dataCache.OnEvicted = func(key string, value interface{}) {
+		dataCache.OnEvicted = func(key string, value any) {
 			value.(*bytes.Buffer).Reset()
 			bufPool.Put(value)
 		}
@@ -158,7 +158,7 @@ func NewDirectoryCache(directory string, config DirectoryCacheConfig) (BlobCache
 			maxEntry = defaultMaxCacheFds
 		}
 		fdCache = cacheutil.NewLRUCache(maxEntry)
-		fdCache.OnEvicted = func(key string, value interface{}) {
+		fdCache.OnEvicted = func(key string, value any) {
 			value.(*os.File).Close()
 		}
 	}

cmd/containerd-stargz-grpc/db/reader.go

@@ -221,7 +221,7 @@ func (r *reader) init(decompressedR io.Reader, rOpts metadata.Options) (retErr e
 
 	// Initialize root node
 	var ok bool
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		fsID := xid.New().String()
 		if err := r.initRootNode(fsID); err != nil {
 			if errors.Is(err, errbolt.ErrBucketExists) {
@@ -930,10 +930,7 @@ func (fr *fileReader) ReadAt(p []byte, off int64) (n int, err error) {
 	}
 
 	compressedBytesRemain := fr.nextOffset - ent.offset
-	bufSize := int(2 << 20)
-	if bufSize > int(compressedBytesRemain) {
-		bufSize = int(compressedBytesRemain)
-	}
+	bufSize := min(int(2<<20), int(compressedBytesRemain))
 
 	br := bufio.NewReaderSize(io.NewSectionReader(fr.r.sr, ent.offset, compressedBytesRemain), bufSize)
 	if _, err := br.Peek(bufSize); err != nil {

cmd/containerd-stargz-grpc/ipfs/resolvehandler.go

@@ -74,6 +74,6 @@ func (f *fetcher) Check() error {
 }
 
 func (f *fetcher) GenID(off int64, size int64) string {
-	sum := sha256.Sum256([]byte(fmt.Sprintf("%s-%d-%d", f.cid, off, size)))
+	sum := sha256.Sum256(fmt.Appendf(nil, "%s-%d-%d", f.cid, off, size))
 	return fmt.Sprintf("%x", sum)
 }

cmd/stargz-store/main.go

@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"io"
 	golog "log"
+	"maps"
 	"math/rand"
 	"net"
 	"os"
@@ -250,9 +251,7 @@ func (sk *storeKeychain) add(data []byte) error {
 	if sk.config == nil {
 		sk.config = make(map[string]authConfig)
 	}
-	for k, c := range conf {
-		sk.config[k] = c
-	}
+	maps.Copy(sk.config, conf)
 	sk.configMu.Unlock()
 	return nil
 }

estargz/build.go

@@ -238,7 +238,6 @@ func Build(tarBlob *io.SectionReader, opt ...Option) (_ *Blob, rErr error) {
 	var mu sync.Mutex
 	var eg errgroup.Group
 	for i, parts := range tarParts {
-		i, parts := i, parts
 		// builds verifiable stargz sub-blobs
 		eg.Go(func() error {
 			esgzFile, err := layerFiles.TempFile("", "esgzdata")

estargz/build_test.go

@@ -354,11 +354,8 @@ func TestSort(t *testing.T) {
 	}
 	for _, tt := range tests {
 		for _, srcCompression := range srcCompressions {
-			srcCompression := srcCompression
 			for _, logprefix := range allowedPrefix {
-				logprefix := logprefix
 				for _, tarprefix := range allowedPrefix {
-					tarprefix := tarprefix
 					t.Run(fmt.Sprintf("%s-logprefix=%q-tarprefix=%q-src=%d", tt.name, logprefix, tarprefix, srcCompression), func(t *testing.T) {
 						// Sort tar file
 						var pfiles []string

estargz/estargz_test.go

@@ -101,10 +101,7 @@ func regularFileReader(name string, size int64, chunkSize int64) (*TOCEntry, *Re
 	var written int64
 	for written < size {
 		remain := size - written
-		cs := chunkSize
-		if remain < cs {
-			cs = remain
-		}
+		cs := min(remain, chunkSize)
 		ent.ChunkSize = cs
 		ent.ChunkOffset = written
 		chunks = append(chunks, ent)