diff --git a/daemon/graphdriver/vfs/quota_linux.go b/daemon/graphdriver/vfs/quota_linux.go index 372cbbb769b94bc897b8ec57912790f65b59602e..0a5caa754b805e21545be534165054b11696996e 100644 --- a/daemon/graphdriver/vfs/quota_linux.go +++ b/daemon/graphdriver/vfs/quota_linux.go @@ -5,7 +5,6 @@ import ( "github.com/sirupsen/logrus" ) -//nolint:structcheck type driverQuota struct { quotaCtl *quota.Control quotaOpt quota.Quota diff --git a/hack/dockerfile/install/golangci_lint.installer b/hack/dockerfile/install/golangci_lint.installer index c6f4b44d16853670cf0ce49e89009022b49c00a8..68785f18b59a3b67307a696c1449ab022f4bbb63 100755 --- a/hack/dockerfile/install/golangci_lint.installer +++ b/hack/dockerfile/install/golangci_lint.installer @@ -1,6 +1,6 @@ #!/bin/sh -: "${GOLANGCI_LINT_VERSION=v1.46.2}" +: "${GOLANGCI_LINT_VERSION=v1.49.0}" install_golangci_lint() { set -e diff --git a/hack/validate/golangci-lint.yml b/hack/validate/golangci-lint.yml index d3b0d5fae43fd7c406c9ee6cf90c71c3ccd91b67..815300506c40f182506605d0a19e994614e9cc9e 100644 --- a/hack/validate/golangci-lint.yml +++ b/hack/validate/golangci-lint.yml @@ -1,6 +1,5 @@ linters: enable: - - deadcode - goimports - gosec - gosimple @@ -9,11 +8,9 @@ linters: - misspell - revive - staticcheck - - structcheck - typecheck - unconvert - unused - - varcheck disable: - errcheck @@ -28,7 +25,11 @@ linters: linters-settings: govet: check-shadowing: false - + revive: + rules: + # FIXME make sure all packages have a description. Currently, there's many packages without. + - name: package-comments + disabled: true issues: # The default exclusion rules are a bit too permissive, so copying the relevant ones below exclude-use-default: false diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go index 034d6c2075f0cde97d9766666ffe3afafb099aa6..38cba829d0edd1918b2d4a7f672802a49d42e2cb 100644 --- a/pkg/devicemapper/devmapper.go +++ b/pkg/devicemapper/devmapper.go @@ -16,7 +16,7 @@ import ( // Same as DM_DEVICE_* enum values from libdevmapper.h // -//nolint:deadcode,unused,varcheck +//nolint:unused const ( deviceCreate TaskType = iota deviceReload diff --git a/volume/drivers/extpoint.go b/volume/drivers/extpoint.go index 7a909130df53e5ebb9b529f7f8f81e9dd0e56a70..46a438612e713881a5a4d80bd74f730affc6aac2 100644 --- a/volume/drivers/extpoint.go +++ b/volume/drivers/extpoint.go @@ -22,7 +22,7 @@ const extName = "VolumeDriver" // This interface is only defined to generate the proxy objects. // It's not intended to be public or reused. // -//nolint:deadcode,unused,varcheck +//nolint:unused type volumeDriver interface { // Create a volume with the given name Create(name string, opts map[string]string) (err error)