the last pile of fixes

Author: egorikas

.golangci.yml

@@ -19,6 +19,16 @@ linters:
       # Such cases aren't reported by default.
       # Default: false
       check-blank: true
+  exclusions:
+    rules:
+      # Exclude staticcheck deprecation warnings in generated proto files
+      - linters:
+          - staticcheck
+        path: "gen/go/proto/.*\\.pb\\.go$"
+      # Exclude staticcheck deprecation warnings for proto imports
+      - linters:
+          - staticcheck
+        text: "SA1019.*github.com/golang/protobuf/proto.*is deprecated"
 formatters:
   enable:
     - gofmt # Format Go code

build-index/cmd/cmd.go

@@ -209,7 +209,7 @@ func Run(flags *Flags, opts ...Option) {
 		log.Fatalf("Error creating write-back manager: %s", err)
 	}
 
-	tagStore := tagstore.New(config.TagStore, stats, ss, backends, writeBackManager)
+	tagStore := tagstore.New(config.TagStore, ss, backends, writeBackManager)
 
 	depResolver, err := tagtype.NewMap(config.TagTypes, originClient)
 	if err != nil {

build-index/tagstore/store.go

@@ -30,8 +30,6 @@ import (
 	"github.com/uber/kraken/lib/store/metadata"
 	"github.com/uber/kraken/utils/closers"
 	"github.com/uber/kraken/utils/log"
-
-	"github.com/uber-go/tally"
 )
 
 // Store errors.
@@ -69,15 +67,10 @@ type tagStore struct {
 // New creates a new Store.
 func New(
 	config Config,
-	stats tally.Scope,
 	fs FileStore,
 	backends *backend.Manager,
 	writeBackManager persistedretry.Manager,
 ) Store {
-	stats = stats.Tagged(map[string]string{
-		"module": "tagstore",
-	})
-
 	s := &tagStore{
 		config:           config,
 		fs:               fs,

build-index/tagstore/store_test.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
-	"github.com/uber-go/tally"
 )
 
 const _testNamespace = ".*"
@@ -64,7 +63,7 @@ func newStoreMocks(t *testing.T) (*storeMocks, func()) {
 }
 
 func (m *storeMocks) new(config Config) Store {
-	return New(config, tally.NoopScope, m.ss, m.backends, m.writeBackManager)
+	return New(config, m.ss, m.backends, m.writeBackManager)
 }
 
 func TestPutAndGetFromDisk(t *testing.T) {

core/peer_id.go

@@ -15,12 +15,12 @@ package core
 
 import (
 	"bytes"
+	"crypto/rand"
 	"crypto/sha1"
 	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 )
 
 // PeerIDFactory defines the method used to generate a peer id.

lib/backend/throttle.go

@@ -54,7 +54,7 @@ func (c *ThrottledClient) Upload(namespace, name string, src io.Reader) error {
 
 // Download downloads name into dst.
 func (c *ThrottledClient) Download(namespace, name string, dst io.Writer) error {
-	info, err := c.Client.Stat(namespace, name)
+	info, err := c.Stat(namespace, name)
 	if err != nil {
 		return err
 	}

lib/containerruntime/dockerdaemon/cli.go

@@ -78,22 +78,26 @@ func parseHost(host string) (*http.Client, string, string, error) {
 	transport := new(http.Transport)
 
 	protocol, addr := strs[0], strs[1]
-	if protocol == "tcp" {
+	switch protocol {
+	case "tcp":
 		parsed, err := url.Parse("tcp://" + addr)
 		if err != nil {
 			return nil, "", "", err
 		}
 		addr = parsed.Host
 		basePath = parsed.Path
-	} else if protocol == "unix" {
+	case "unix":
 		if len(addr) > len(syscall.RawSockaddrUnix{}.Path) {
 			return nil, "", "", fmt.Errorf("unix socket path %q is too long", addr)
 		}
 		transport.DisableCompression = true
-		transport.Dial = func(_, _ string) (net.Conn, error) {
-			return net.DialTimeout(protocol, addr, _defaultTimeout)
+		transport.DialContext = func(ctx context.Context, _, _ string) (net.Conn, error) {
+			d := &net.Dialer{
+				Timeout: _defaultTimeout,
+			}
+			return d.DialContext(ctx, protocol, addr)
 		}
-	} else {
+	default:
 		return nil, "", "", fmt.Errorf("protocol %s not supported", protocol)
 	}
 

lib/dockerregistry/storage_driver.go

@@ -360,7 +360,7 @@ func (d *KrakenStorageDriver) Delete(ctx context.Context, path string) error {
 // URLFor returns url for path
 func (d *KrakenStorageDriver) URLFor(ctx context.Context, path string, options map[string]interface{}) (string, error) {
 	log.Debugf("(*KrakenStorageDriver).URLFor %s", path)
-	return "", fmt.Errorf("Not implemented")
+	return "", fmt.Errorf("not implemented")
 }
 
 // Walk is not implemented.

lib/dockerregistry/testutils_test.go

@@ -151,6 +151,10 @@ func genManifestListPath(repo string) string {
 	return fmt.Sprintf("/docker/registry/v2/repositories/%s/_manifests/tags", repo)
 }
 
+type contextKey string
+
+const varsNameKey contextKey = "vars.name"
+
 func contextFixture() context.Context {
-	return context.WithValue(context.Background(), "vars.name", "dummy")
+	return context.WithValue(context.Background(), varsNameKey, "dummy")
 }

lib/store/base/file_entry.go

@@ -533,7 +533,7 @@ func (entry *localFileEntry) SetMetadataAt(
 	if _, err := f.ReadAt(prev, offset); err != nil {
 		return false, err
 	}
-	if bytes.Compare(prev, b) == 0 {
+	if bytes.Equal(prev, b) {
 		return false, nil
 	}
 	if _, err := f.WriteAt(b, offset); err != nil {