Merge pull request #34588 from dnephin/more-linters

Add deadcode and goimports linters
Upstream-commit: 6540d5581473c292ade46ee1b620172441943f4b
Component: engine

components/engine/api/server/httputils/errors.go

@@ -13,14 +13,6 @@ import (
 	"google.golang.org/grpc/codes"
 )
 
-// httpStatusError is an interface
-// that errors with custom status codes
-// implement to tell the api layer
-// which response status to set.
-type httpStatusError interface {
-	HTTPErrorStatusCode() int
-}
-
 type causer interface {
 	Cause() error
 }

components/engine/api/types/filters/parse.go

@@ -276,14 +276,6 @@ func (filters Args) Validate(accepted map[string]bool) error {
 	return nil
 }
 
-type invalidFilterError string
-
-func (e invalidFilterError) Error() string {
-	return "Invalid filter: '" + string(e) + "'"
-}
-
-func (invalidFilterError) InvalidParameter() {}
-
 // WalkValues iterates over the list of filtered values for a field.
 // It stops the iteration if it finds an error and it returns that error.
 func (filters Args) WalkValues(field string, op func(value string) error) error {

components/engine/client/client_mock_test.go

@@ -9,6 +9,14 @@ import (
 	"github.com/docker/docker/api/types"
 )
 
+// transportFunc allows us to inject a mock transport for testing. We define it
+// here so we can detect the tlsconfig and return nil for only this type.
+type transportFunc func(*http.Request) (*http.Response, error)
+
+func (tf transportFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return tf(req)
+}
+
 func newMockClient(doer func(*http.Request) (*http.Response, error)) *http.Client {
 	return &http.Client{
 		Transport: transportFunc(doer),

components/engine/client/image_search_test.go

@@ -2,18 +2,17 @@ package client
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
 	"testing"
 
-	"golang.org/x/net/context"
-
-	"encoding/json"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
+	"golang.org/x/net/context"
 )
 
 func TestImageSearchAnyError(t *testing.T) {

components/engine/client/transport.go

@@ -5,14 +5,6 @@ import (
 	"net/http"
 )
 
-// transportFunc allows us to inject a mock transport for testing. We define it
-// here so we can detect the tlsconfig and return nil for only this type.
-type transportFunc func(*http.Request) (*http.Response, error)
-
-func (tf transportFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return tf(req)
-}
-
 // resolveTLSConfig attempts to resolve the TLS configuration from the
 // RoundTripper.
 func resolveTLSConfig(transport http.RoundTripper) *tls.Config {

components/engine/cmd/dockerd/config_solaris.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"github.com/docker/docker/daemon/config"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	units "github.com/docker/go-units"
 	"github.com/spf13/pflag"
 )
 

components/engine/cmd/dockerd/daemon_solaris.go

@@ -5,27 +5,14 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 	"path/filepath"
 
 	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/system"
 	"golang.org/x/sys/unix"
 )
 
 const defaultDaemonConfigFile = ""
 
-// currentUserIsOwner checks whether the current user is the owner of the given
-// file.
-func currentUserIsOwner(f string) bool {
-	if fileInfo, err := system.Stat(f); err == nil && fileInfo != nil {
-		if int(fileInfo.UID()) == os.Getuid() {
-			return true
-		}
-	}
-	return false
-}
-
 // setDefaultUmask sets the umask to 0022 to avoid problems
 // caused by custom umask
 func setDefaultUmask() error {

components/engine/cmd/dockerd/daemon_windows.go

@@ -14,12 +14,6 @@ import (
 
 var defaultDaemonConfigFile = ""
 
-// currentUserIsOwner checks whether the current user is the owner of the given
-// file.
-func currentUserIsOwner(f string) bool {
-	return false
-}
-
 // setDefaultUmask doesn't do anything on windows
 func setDefaultUmask() error {
 	return nil

components/engine/daemon/config/config_solaris.go

@@ -1,9 +1,5 @@
 package config
 
-import (
-	"github.com/spf13/pflag"
-)
-
 // Config defines the configuration of a docker daemon.
 // These are the configuration settings that you pass
 // to the docker daemon when you launch it with say: `docker -d -e lxc`

components/engine/daemon/daemon_solaris.go

@@ -22,7 +22,7 @@ import (
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
 	lntypes "github.com/docker/libnetwork/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
+	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -32,10 +32,9 @@ import (
 import "C"
 
 const (
-	defaultVirtualSwitch = "Virtual Switch"
+	platformSupported   = true
-	platformSupported    = true
+	solarisMinCPUShares = 1
-	solarisMinCPUShares  = 1
+	solarisMaxCPUShares = 65535
-	solarisMaxCPUShares  = 65535
 )
 
 func getMemoryResources(config containertypes.Resources) specs.CappedMemory {

components/engine/daemon/daemon_windows.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"syscall"
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/docker/docker/api/types"
@@ -38,9 +37,6 @@ const (
 	windowsMaxCPUShares  = 10000
 	windowsMinCPUPercent = 1
 	windowsMaxCPUPercent = 100
-	windowsMinCPUCount   = 1
-
-	errInvalidState = syscall.Errno(0x139F)
 )
 
 // Windows has no concept of an execution state directory. So use config.Root here.
@@ -60,22 +56,6 @@ func parseSecurityOpt(container *container.Container, config *containertypes.Hos
 	return nil
 }
 
-func getBlkioReadIOpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioWriteIOpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioReadBpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioWriteBpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
 func (daemon *Daemon) getLayerInit() func(string) error {
 	return nil
 }

components/engine/daemon/graphdriver/driver_freebsd.go

@@ -1,6 +1,10 @@
 package graphdriver
 
-import "golang.org/x/sys/unix"
+import (
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
 
 var (
 	// Slice of drivers that should be used in an order

components/engine/daemon/graphdriver/plugin.go

@@ -2,22 +2,12 @@ package graphdriver
 
 import (
 	"fmt"
-	"io"
 	"path/filepath"
 
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/plugin/v2"
 )
 
-type pluginClient interface {
-	// Call calls the specified method with the specified arguments for the plugin.
-	Call(string, interface{}, interface{}) error
-	// Stream calls the specified method with the specified arguments for the plugin and returns the response IO stream
-	Stream(string, interface{}) (io.ReadCloser, error)
-	// SendFile calls the specified method, and passes through the IO stream
-	SendFile(string, io.Reader, interface{}) error
-}
-
 func lookupPlugin(name string, pg plugingetter.PluginGetter, config Options) (Driver, error) {
 	if !config.ExperimentalEnabled {
 		return nil, fmt.Errorf("graphdriver plugins are only supported with experimental mode")

components/engine/daemon/health.go

@@ -45,8 +45,7 @@ const (
 const (
 	// Exit status codes that can be returned by the probe command.
 
-	exitStatusHealthy   = 0 // Container is healthy
+	exitStatusHealthy = 0 // Container is healthy
-	exitStatusUnhealthy = 1 // Container is unhealthy
 )
 
 // probe implementations know how to run a particular type of probe.

components/engine/daemon/metrics.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/go-metrics"
+	metrics "github.com/docker/go-metrics"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
@@ -16,7 +16,6 @@ const metricsPluginType = "MetricsCollector"
 
 var (
 	containerActions          metrics.LabeledTimer
-	containerStates           metrics.LabeledGauge
 	imageActions              metrics.LabeledTimer
 	networkActions            metrics.LabeledTimer
 	engineInfo                metrics.LabeledGauge

components/engine/hack/dockerfile/install-binaries.sh

@@ -60,11 +60,7 @@ install_gometalinter() {
 	cd "$GOPATH/src/github.com/alecthomas/gometalinter"
 	git checkout -q "$GOMETALINTER_COMMIT"
 	go build -o /usr/local/bin/gometalinter github.com/alecthomas/gometalinter
-	(
+	GOBIN=/usr/local/bin gometalinter --install
-		export GOBIN=/usr/local/bin
-		export GOPATH="$PWD/_linters/"
-		go install github.com/golang/lint/golint
-	)
 }
 
 for prog in "$@"

components/engine/hack/validate/gometalinter.json

@@ -10,7 +10,9 @@
   ],
 
   "Enable": [
+    "deadcode",
     "gofmt",
+    "goimports",
     "golint",
     "vet"
   ],

components/engine/libcontainerd/client_solaris.go

@@ -1,6 +1,9 @@
 package libcontainerd
 
-import "golang.org/x/net/context"
+import (
+	containerd "github.com/containerd/containerd/api/grpc/types"
+	"golang.org/x/net/context"
+)
 
 type client struct {
 	clientCommon

components/engine/pkg/devicemapper/devmapper.go

@@ -14,6 +14,7 @@ import (
 )
 
 // Same as DM_DEVICE_* enum values from libdevmapper.h
+// nolint: deadcode
 const (
 	deviceCreate TaskType = iota
 	deviceReload

components/engine/pkg/fileutils/fileutils_test.go

@@ -1,6 +1,7 @@
 package fileutils
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path"
@@ -9,7 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"fmt"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

components/engine/pkg/mount/mounter_solaris.go

@@ -3,8 +3,9 @@
 package mount
 
 import (
-	"golang.org/x/sys/unix"
 	"unsafe"
+
+	"golang.org/x/sys/unix"
 )
 
 // #include <stdlib.h>

components/engine/pkg/plugins/pluginrpc-gen/fixtures/foo.go

@@ -1,17 +1,11 @@
 package foo
 
 import (
-	"fmt"
-
 	aliasedio "io"
 
 	"github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture"
 )
 
-var (
-	errFakeImport = fmt.Errorf("just to import fmt for imports tests")
-)
-
 type wobble struct {
 	Some      string
 	Val       string

components/engine/pkg/streamformatter/streamwriter_test.go

@@ -1,9 +1,9 @@
 package streamformatter
 
 import (
+	"bytes"
 	"testing"
 
-	"bytes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

components/engine/plugin/backend_linux.go

@@ -32,7 +32,7 @@ import (
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/plugin/v2"
 	refstore "github.com/docker/docker/reference"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
@@ -652,22 +652,6 @@ func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error {
 	return nil
 }
 
-func getMounts(root string) ([]string, error) {
-	infos, err := mount.GetMounts()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to read mount table")
-	}
-
-	var mounts []string
-	for _, m := range infos {
-		if strings.HasPrefix(m.Mountpoint, root) {
-			mounts = append(mounts, m.Mountpoint)
-		}
-	}
-
-	return mounts, nil
-}
-
 // Set sets plugin args
 func (pm *Manager) Set(name string, args []string) error {
 	p, err := pm.config.Store.GetV2Plugin(name)

components/engine/registry/resumable/resumablerequestreader_test.go

@@ -2,8 +2,6 @@ package resumable
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -11,6 +9,9 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestResumableRequestHeaderSimpleErrors(t *testing.T) {

components/engine/volume/drivers/extpoint.go

@@ -32,6 +32,7 @@ func NewVolumeDriver(name string, baseHostPath string, c client) volume.Driver {
 // volumeDriver defines the available functions that volume plugins must implement.
 // This interface is only defined to generate the proxy objects.
 // It's not intended to be public or reused.
+// nolint: deadcode
 type volumeDriver interface {
 	// Create a volume with the given name
 	Create(name string, opts map[string]string) (err error)

components/engine/volume/volume_unix.go

@@ -119,10 +119,6 @@ func validateNotRoot(p string) error {
 	return nil
 }
 
-func validateCopyMode(mode bool) error {
-	return nil
-}
-
 func convertSlash(p string) string {
 	return p
 }

components/engine/volume/volume_windows.go

@@ -183,13 +183,6 @@ func validateNotRoot(p string) error {
 	return nil
 }
 
-func validateCopyMode(mode bool) error {
-	if mode {
-		return fmt.Errorf("Windows does not support copying image path content")
-	}
-	return nil
-}
-
 func convertSlash(p string) string {
 	return filepath.FromSlash(p)
 }