Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get golangci lint back on its feet #103650

Merged
merged 4 commits into from Jul 15, 2021
Merged

Get golangci lint back on its feet #103650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b74fe23
update golangci-lint to newer version
dims Jul 12, 2021
26cc8e4
fix deadcode issues
dims Jul 12, 2021
07332ad
fix ineffassign and varcheck
dims Jul 12, 2021
75748c1
enable verify-golangci-lint.sh
dims Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kube-proxy/app/server.go
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ const (
proxyModeUserspace = "userspace"
proxyModeIPTables = "iptables"
proxyModeIPVS = "ipvs"
proxyModeKernelspace = "kernelspace"
proxyModeKernelspace = "kernelspace" //nolint:deadcode,varcheck
)

// proxyRun defines the interface to run a specified ProxyServer
Expand Down
1 change: 0 additions & 1 deletion hack/make-rules/verify.sh
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@ EXCLUDED_PATTERNS=(
"verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage
"verify-*-dockerized.sh" # Don't run any scripts that intended to be run dockerized
"verify-govet-levee.sh" # Do not run levee analysis by default while KEP-1933 implementation is in alpha.
"verify-golangci-lint.sh" # Experimental - intended to be run by hand periodically
)

# Exclude generated-files-remake in certain cases, if they're running in a separate job.
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c
github.com/client9/misspell v0.3.4
github.com/golangci/golangci-lint v1.36.0
github.com/golangci/golangci-lint v1.41.1
github.com/google/go-flow-levee v0.1.5
gotest.tools/gotestsum v1.6.4
honnef.co/go/tools v0.2.0
Expand Down
439 changes: 344 additions & 95 deletions hack/tools/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions pkg/apis/storage/validation/validation_test.go
View file
Open in desktop
Expand Up @@ -1696,8 +1696,7 @@ func TestCSIDriverValidation(t *testing.T) {
storageCapacity := true
notStorageCapacity := false
supportedFSGroupPolicy := storage.FileFSGroupPolicy
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
invalidFSGroupPolicy = "invalid-mode"
invalidFSGroupPolicy := storage.FSGroupPolicy("invalid-mode")
successCases := []storage.CSIDriver{
{
ObjectMeta: metav1.ObjectMeta{Name: driverName},
Expand Down Expand Up @@ -2051,8 +2050,7 @@ func TestCSIDriverValidationUpdate(t *testing.T) {
{
name: "FSGroupPolicy invalidated",
modify: func(new *storage.CSIDriver) {
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
invalidFSGroupPolicy = "invalid"
invalidFSGroupPolicy := storage.FSGroupPolicy("invalid")
new.Spec.FSGroupPolicy = &invalidFSGroupPolicy
},
},
Expand Down
2 changes: 0 additions & 2 deletions pkg/credentialprovider/gcp/metadata.go
View file
Open in desktop
Expand Up @@ -41,8 +41,6 @@ const (
DockerConfigURLKey = metadataAttributes + "google-dockercfg-url"
serviceAccounts = metadataURL + "instance/service-accounts/"
metadataScopes = metadataURL + "instance/service-accounts/default/scopes"
metadataToken = metadataURL + "instance/service-accounts/default/token"
metadataEmail = metadataURL + "instance/service-accounts/default/email"
// StorageScopePrefix is the prefix checked by ContainerRegistryProvider.Enabled.
StorageScopePrefix = "https://www.googleapis.com/auth/devstorage"
cloudPlatformScopePrefix = "https://www.googleapis.com/auth/cloud-platform"
Expand Down
2 changes: 1 addition & 1 deletion pkg/generated/openapi/cmd/models-schema/main.go
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ func output() error {
if err != nil {
return fmt.Errorf("error serializing api definitions: %w", err)
}
_, err = os.Stdout.Write(data)
os.Stdout.Write(data)
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/certificate/bootstrap/bootstrap_test.go
View file
Open in desktop
Expand Up @@ -387,7 +387,7 @@ func TestRequestNodeCertificate(t *testing.T) {
type failureType int

const (
noError failureType = iota
noError failureType = iota //nolint:deadcode,varcheck
createError
certificateSigningRequestDenied
)
Expand Down
1 change: 0 additions & 1 deletion pkg/registry/core/pod/rest/metrics.go
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@ const (

usageEnforce = "enforce_tls"
usageSkipAllowed = "skip_tls_allowed"
usageSkipDenied = "skip_tls_denied"
)

var (
Expand Down
1 change: 0 additions & 1 deletion pkg/util/iptables/iptables.go
View file
Open in desktop
Expand Up @@ -631,7 +631,6 @@ const (
opFlushChain operation = "-F"
opDeleteChain operation = "-X"
opListChain operation = "-S"
opAppendRule operation = "-A"
opCheckRule operation = "-C"
opDeleteRule operation = "-D"
)
Expand Down
56 changes: 0 additions & 56 deletions plugin/pkg/admission/imagepolicy/certs_test.go
View file
Open in desktop
Expand Up @@ -21,34 +21,6 @@ limitations under the License.

package imagepolicy

var caKey = []byte(`-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAoKjaP9PtRAGRNCx8z+0LTGt2eEduqElcPrm8EvlBwn3dnLFo
55x+Tejb6ysQsyy1BKI0dRdX4tNSAgFFFaIVcsOo9kGtPq7QsSd4VWViNE3L5zJA
+0X2ztHBkPlQXwDrtArsNKxwcpyHP9sXE05BN36XBjAz2XkusTkFrdJ/PzjZhlb4
9i9gTZ0bJbexQ1+dfZX2WpY70JypYnKrbV1dLj5ORb65SC8IWZcG/ouqLWAN+lT+
eug8P6PjoOQWs3qsl0bSAtAdiYcwXKtPiBEWPJe24ACywyE+8jVzmIJqAm0U1V8k
GTHzjmSRwzgX/VN5JMri/nxNIW5UsbhHzYHfjQIDAQABAoIBAQCIeAWz1Bwl+ULT
U7rNkChZyKrAbsUDdBVEPtcQMuR2Bh5Z/KUEoHz1RwiP0WwFFsPI5NO0ZpjD1wdB
Jrz9LEoVyzfZvl4f8bTZ1pIzz8PEdBTxFVH3Xy3P7oMC15Q6rviIXgLYl2WJJYcJ
adxHDOD+96vnmMhiQbq01aAKT9TA6PvXXDusfadMQ+il+mEbeZz4aNYBk9u+34Co
aQTNwlLft5anW2820IMJdJR/bFjyX71cPID1rIjw4VOQZExIpIEnuHPiulyE4EvJ
hvvVKAm0dRjHg39cz0eAQ6PntX3DUvjNfcLLrj7sQxLco1cnAKZxhpZ8ajtvynr5
pF2d5xYBAoGBAM8y/e5+raHTLHEKZUc0vekUey3fc4aRqptyAKTS0ZvOYBXg4Vhl
mOK7066IEqwF4UHGmQqW6D5HstqPGx0uN0d9IyImUqDp0JotdFSZMEMQkYLyFD+r
J7O2nOO6E4SOxXO9/q9iSB+G/qgl6LS3O9+58uHTYEbUommiDZ6a18qBAoGBAMZ/
xSGMa3b6vrU3rUTEh+xBh6YRVNYAxWwpGg2sO0k2brT3SxSMCrx1wvNGY+k7XNx0
JJfZQDC/wlR0rcVTnPCi/cE9FTUlh23xXCPRlxwc4vLly+7yU95LhAO+N9XAwsrs
OIi4lR57jxoLNO2ofoAVMvllkE5Eo5W6lOPR2xcNAoGAV1Tv0OFV//pJJhAypfOm
BCLc1HX1dIfbOA+yE8bEEH7I4w/ZC3AvI4n1a//wls8Xpai2gs8ebnm7+gENdZww
MpKdB1zNwQMsKH/2I146CFpoap/sRvW2EzpqIFYiueGPefxf575uFdPJbEgmMF13
ABKZO/PjBZfEKO/j+7DaOYECgYBYX+Zqa1QlIrnpgKJZ7Y3+d6ZnH2w/4xQCdcIt
uDKlA+ECHN+GhFr7UQq8uOgenNlZJTRtjsHvclCYvWHoarOCx25mrEVW5iCHqF+3
asb2Mz4vmnPTLHx+iex6piPBvRJ8ufLpnBR3/9bUZ4znCo9XgxiwxLEcx551OR60
12fNuQKBgC1fkqgtDDxQzrabSmmiqXthcPXxFdsYqnSNlFgba0uaAp9LREztSrX8
QhwSoSwHVmjBvR6SybLYdsZ9Efj/w7XBejOOcS44MOoHYYFdsP7W47Ao5QFqvDoI
oqyQ1R73cF9WX6obRQwH4P3DvcsBebOjvjMX9mljKtpJMc9KqrGc
-----END RSA PRIVATE KEY-----`)

var caCert = []byte(`-----BEGIN CERTIFICATE-----
MIIDFzCCAf+gAwIBAgIJAJlL10mfdZraMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
BAMMFndlYmhvb2tfaW1hZ2Vwb2xpY3lfY2EwIBcNMTYwODEyMjAyMjUwWhgPMjI5
Expand All @@ -69,34 +41,6 @@ ljW5xekKRh4uzP85X7rEgrFen/my5Fs/cylkFvYIiZwgn6NLgW3BNi+m31XIfU0S
xIbgh4UH0dwc6Zk8WUwFud4GXj6OyGneMGKB
-----END CERTIFICATE-----`)

var badCAKey = []byte(`-----BEGIN RSA PRIVATE KEY-----
MIIEpQIBAAKCAQEAnKpC89q4/H+Xg91xI+GLhkrpJrO4n3nw0+/EQUoF9qwLtEDk
mJp6ymUulwJgfvJwHOsUYqQB6jMKfXyqeSR24ssjjF9LTKhaQMZOGcW5Mshi04Ie
USX93wDZwbWwqihVSqWaMpmf3JByeldnXNtc29Ik6NwqZcNWW5kEsSszheLhOU4i
ZcRUlovwMYhHX37vQCQ1aygMaIMgBOb/vogSNxumqPKS4WdWsjss6LmEPnm350e+
+9cb6RAfrDlOaj32VbLEp500SfBpZeCuyc5v81X12HT4V0qmsqIZ79tIgrqAaPxE
D/HJXPpH64EAr23bR9dMPLXTh6w2yYWu+NGYywIDAQABAoIBAQCE/CZPN1gVxf0I
i12x9o/oVAhruN08Sld6oCm4viwnws1AmmExhNg8m/0bZIIi4Ir4kThBrzSM5/y8
nqlaofBk/cjULEQP80yBdZPwXp2hlOYG4on3mkdRGDjALQmktw4HimFFGJDRuq/i
V/U+plrBojWAkPtQXKsen9qSxbg7qhI6KZyUQKExIHhsCfmE1ZzGx+/bgLVJEagi
7zzZdAj2BzdoCk8yySAAsZG+pNSnd8gs5EzzRJ1RXanwxPSeEG/guX9YhLgLhhFu
XzXngJDKVVhz4F2TfxtqIvZYvTMNh0R1OE0OUO2P88M837KKk5BHvW9oqYKZTUFV
MC9k5No5AoGBAMtUBp8UcYZy+yetOAK2iGaEYwuWx8vwjY0c1POWun2Hny0nYxTQ
WxXXqKaJydxZ+DlD3XuRKmMlKZQsp+bzuL5ukWN/ipO5tgQQfuKOZqVwvL19GkFi
+Qr70G/TvYT/rv6A4s6XqbG4xt+7c2gf/XSghyoIyq1uwOcNNtrMdM/tAoGBAMU/
tYc4d+vAl7hd8TwhFiZiC3N84C1HwsPVj38uqQI/j8boB21Bhpw6HHzq+VdVPfvp
zk5e8AiQdSpitM7pBVmLpoRdTQjdlUDFRUi4TdJwfp5P7dXM8D6swNQ9f9w180na
5ewu16PSC+sh19wAl04KwOmiDqZujJrBgWnFcESXAoGBALGofoybAUK3zqlxWcJN
GUtyG1Sx72tLiXMmIQ+hwNsUGEoM4y75isy//ZVeSammVxQ6Lxjb00yD2RumFSLg
C6kg1Ro6A6xmFRriCuwL/rZJljB/UeSWBQLK2eoL+clu2sl3djWLIPOvft1YXVM6
uGwiI1fgDK+TWSvJSQfOo7ZVAoGBAK+A6DvQeqNBUb2xmJsvtU2hnx661Zx0ZU9q
DavUEHz3oS4R9cm4q9UFv6NGT2Tta6FhfzcsMdbs8dMs0EPqAeCS6S6M9aYVwl9H
J0Z09olvnrmt1KiPGJQrkcdGkSWWu0nTgxCK/UO9+OzVyALwY7AE0XEPyIk9g82O
r181VZcxAoGANY2QGYrNtfa++o2B0O4qskKxhYEeCnZPptmjVO0oHOx2YSDQXK3K
B0evCQ7ylvMnobNLjp9bqD14a0M86QjRlpSg1vHUhBsETZICc+E0UgV28CdWgYtt
urARDE9ZpLVSRfPVAitC1I76pZwevsbQ9TeS2p0cWQpYYKmBtGpkdug=
-----END RSA PRIVATE KEY-----`)

var badCACert = []byte(`-----BEGIN CERTIFICATE-----
MIIDFzCCAf+gAwIBAgIJANQEJyMW4HFZMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
BAMMFndlYmhvb2tfaW1hZ2Vwb2xpY3lfY2EwIBcNMTYwODEyMjAyMjUwWhgPMjI5
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/common/node/pods.go
View file
Open in desktop
Expand Up @@ -244,10 +244,6 @@ var _ = SIGDescribe("Pods", func() {
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for pods")
framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{
dims marked this conversation as resolved.
Show resolved Hide resolved
LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion,
}

listCompleted := make(chan bool, 1)
lw := &cache.ListWatch{
Expand Down
1 change: 1 addition & 0 deletions test/e2e/lifecycle/bootstrap/bootstrap_signer.go
View file
Open in desktop
Expand Up @@ -78,6 +78,7 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {

ginkgo.By("wait for the bootstrap token secret be signed")
err = WaitforSignedClusterInfoByBootStrapToken(c, tokenID)
framework.ExpectNoError(err)

cfgMap, err := f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Get(context.TODO(), bootstrapapi.ConfigMapClusterInfo, metav1.GetOptions{})
framework.ExpectNoError(err)
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/network/ingress.go
View file
Open in desktop
Expand Up @@ -47,8 +47,7 @@ import (
)

const (
negUpdateTimeout = 2 * time.Minute
instanceGroupAnnotation = "ingress.gcp.kubernetes.io/instance-groups"
negUpdateTimeout = 2 * time.Minute
)

var _ = common.SIGDescribe("Loadbalancing: L7", func() {
Expand Down
1 change: 1 addition & 0 deletions test/e2e/node/events.go
View file
Open in desktop
Expand Up @@ -83,6 +83,7 @@ var _ = SIGDescribe("Events", func() {
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := metav1.ListOptions{LabelSelector: selector.String()}
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err)
framework.ExpectEqual(len(pods.Items), 1)

ginkgo.By("retrieving the pod")
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/node/pods.go
View file
Open in desktop
Expand Up @@ -78,10 +78,6 @@ var _ = SIGDescribe("Pods Extended", func() {
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for pod")
framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{
dims marked this conversation as resolved.
Show resolved Hide resolved
LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion,
}

ginkgo.By("submitting the pod to kubernetes")
podClient.Create(pod)
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/scheduling/limit_range.go
View file
Open in desktop
Expand Up @@ -72,10 +72,6 @@ var _ = SIGDescribe("LimitRange", func() {
limitRanges, err := f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for limitRanges")
framework.ExpectEqual(len(limitRanges.Items), 0)
options = metav1.ListOptions{
dims marked this conversation as resolved.
Show resolved Hide resolved
LabelSelector: selector.String(),
ResourceVersion: limitRanges.ListMeta.ResourceVersion,
}

listCompleted := make(chan bool, 1)
lw := &cache.ListWatch{
Expand Down
1 change: 0 additions & 1 deletion test/e2e/storage/drivers/csi-test/mock/service/service.go
View file
Open in desktop
Expand Up @@ -157,7 +157,6 @@ const (
gib int64 = mib * 1024
gib100 int64 = gib * 100
tib int64 = gib * 1024
tib100 int64 = tib * 100
)

func (s *service) newVolume(name string, capcity int64) csi.Volume {
Expand Down
4 changes: 2 additions & 2 deletions test/integration/evictions/evictions_test.go
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ const (
func TestConcurrentEvictionRequests(t *testing.T) {
podNameFormat := "test-pod-%d"

s, closeFn, rm, informers, clientSet := rmSetup(t)
s, closeFn, rm, informers, _ := rmSetup(t)
defer closeFn()

ns := framework.CreateTestingNamespace("concurrent-eviction-requests", s, t)
Expand Down Expand Up @@ -180,7 +180,7 @@ func TestConcurrentEvictionRequests(t *testing.T) {

// TestTerminalPodEviction ensures that PDB is not checked for terminal pods.
func TestTerminalPodEviction(t *testing.T) {
s, closeFn, rm, informers, clientSet := rmSetup(t)
s, closeFn, rm, informers, _ := rmSetup(t)
defer closeFn()

ns := framework.CreateTestingNamespace("terminalpod-eviction", s, t)
Expand Down