Merge pull request #3411 from mxpv/linter

Switch from gometalinter to golangci-lint

.golangci.yml

@@ -0,0 +1,21 @@
+linters:
+  enable:
+    - structcheck
+    - varcheck
+    - staticcheck
+    - unconvert
+    - gofmt
+    - goimports
+    - golint
+    - ineffassign
+    - vet
+    - unused
+    - misspell
+  disable:
+    - errcheck
+
+run:
+  skip-dirs:
+    - api
+    - design
+    - docs

.gometalinter.json

@@ -1,23 +0,0 @@
-{
-  "Vendor": true,
-  "Deadline": "2m",
-  "Sort": ["linter", "severity", "path", "line"],
-  "Exclude": [
-    ".*\\.pb\\.go",
-    "fetch\\.go:.*::error: unrecognized printf verb 'r'"
-  ],
-  "EnableGC": true,
-
-  "Enable": [
-    "structcheck",
-    "varcheck",
-    "staticcheck",
-    "unconvert",
-
-    "gofmt",
-    "goimports",
-    "golint",
-    "ineffassign",
-    "vet"
-  ]
-}

Makefile

@@ -121,7 +121,7 @@ all: binaries
 
 check: proto-fmt ## run all linters
 	@echo "$(WHALE) $@"
-	gometalinter --config .gometalinter.json ./...
+	golangci-lint run
 
 ci: check binaries checkprotos coverage coverage-integration ## to be used by the CI
 

cmd/containerd-shim-runc-v1/main.go

@@ -19,7 +19,7 @@
 package main
 
 import (
-	"github.com/containerd/containerd/runtime/v2/runc/v1"
+	v1 "github.com/containerd/containerd/runtime/v2/runc/v1"
 	"github.com/containerd/containerd/runtime/v2/shim"
 )
 

cmd/containerd-shim-runc-v2/main.go

@@ -19,7 +19,7 @@
 package main
 
 import (
-	"github.com/containerd/containerd/runtime/v2/runc/v2"
+	v2 "github.com/containerd/containerd/runtime/v2/runc/v2"
 	"github.com/containerd/containerd/runtime/v2/shim"
 )
 

cmd/ctr/commands/events/events.go

@@ -47,7 +47,7 @@ var Command = cli.Command{
 			var e *events.Envelope
 			select {
 			case e = <-eventsCh:
-			case err, open = <-errCh:
+			case err = <-errCh:
 				return err
 			}
 			if e != nil {

cmd/ctr/commands/plugins/plugins.go

@@ -27,7 +27,7 @@ import (
 	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	"github.com/containerd/containerd/platforms"
-	"github.com/opencontainers/image-spec/specs-go/v1"
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc/codes"
 )

images/archive/reference.go

@@ -91,7 +91,7 @@ func familiarizeReference(ref string) (string, error) {
 func ociReferenceName(name string) string {
 	// OCI defines the reference name as only a tag excluding the
 	// repository. The containerd annotation contains the full image name
-	// since the tag is insufficent for correctly naming and referring to an
+	// since the tag is insufficient for correctly naming and referring to an
 	// image
 	var ociRef string
 	if spec, err := reference.Parse(name); err == nil {

pkg/progress/escape.go

@@ -19,6 +19,6 @@ package progress
 const (
 	escape = "\x1b"
 	reset  = escape + "[0m"
-	red    = escape + "[31m" // nolint: staticcheck, varcheck
+	red    = escape + "[31m" // nolint: deadcode, varcheck, unused
 	green  = escape + "[32m"
 )

runtime/v2/binary.go

@@ -87,7 +87,7 @@ func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_
 		defer f.Close()
 		if _, err := io.Copy(os.Stderr, f); err != nil {
 			// When using a multi-container shim the 2nd to Nth container in the
-			// shim will not have a seperate log pipe. Ignore the failure log
+			// shim will not have a separate log pipe. Ignore the failure log
 			// message here when the shim connect times out.
 			if !os.IsNotExist(errors.Cause(err)) {
 				log.G(ctx).WithError(err).Error("copy shim log")

runtime/v2/runc/container.go

@@ -261,7 +261,7 @@ func (c *Container) Process(id string) (process.Process, error) {
 // ReserveProcess checks for the existence of an id and atomically
 // reserves the process id if it does not already exist
 //
-// Returns true if the process id was sucessfully reserved and a
+// Returns true if the process id was successfully reserved and a
 // cancel func to release the reservation
 func (c *Container) ReserveProcess(id string) (bool, func()) {
 	c.mu.Lock()

runtime/v2/shim.go

@@ -79,7 +79,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 		defer f.Close()
 		if _, err := io.Copy(os.Stderr, f); err != nil {
 			// When using a multi-container shim the 2nd to Nth container in the
-			// shim will not have a seperate log pipe. Ignore the failure log
+			// shim will not have a separate log pipe. Ignore the failure log
 			// message here when the shim connect times out.
 			if !os.IsNotExist(errors.Cause(err)) {
 				log.G(ctx).WithError(err).Error("copy shim log")

script/setup/install-dev-tools

@@ -21,6 +21,5 @@
 set -eu -o pipefail
 
 go get -u github.com/stevvooe/protobuild
-go get -u github.com/alecthomas/gometalinter
-gometalinter --install >/dev/null
+go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 go get -u github.com/cpuguy83/go-md2man

services/tasks/local.go

@@ -43,7 +43,7 @@ import (
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
-	"github.com/containerd/containerd/runtime/v2"
+	v2 "github.com/containerd/containerd/runtime/v2"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/containerd/services"
 	"github.com/containerd/typeurl"

windows/task.go

@@ -283,7 +283,7 @@ func (t *task) Update(ctx context.Context, resources *types.Any) error {
 
 func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) {
 	p = t.getProcess(id)
-	if p == nil {
+	if p == nil { // nolint: govet
 		err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id)
 	}