[chore] lint fixes

.golangci.yaml

@@ -3,8 +3,6 @@ run:
   skip-dirs:
   - pkg/client
   - pkg/apis
-  - internal/ # TODO: https://github.com/Kong/kubernetes-ingress-controller/issues/1597
-  - hack/ # TODO: https://github.com/Kong/kubernetes-ingress-controller/issues/1597
 linters:
   enable:
   - asciicheck
@@ -16,11 +14,8 @@ linters:
   - errcheck
   - exhaustive
   - exportloopref
-  - gci
-  - gochecknoinits
   - gofmt
   - goimports
-  - gomnd
   - gosec
   - gosimple
   - govet

Makefile

@@ -5,6 +5,7 @@
 TAG?=2.0.0-alpha.3
 REGISTRY?=kong
 REPO_INFO=$(shell git config --get remote.origin.url)
+REPO_URL=github.com/kong/kubernetes-ingress-controller
 IMGNAME?=kubernetes-ingress-controller
 IMAGE = $(REGISTRY)/$(IMGNAME)
 IMG ?= controller:latest
@@ -69,6 +70,10 @@ build: generate fmt vet lint
 		-X github.com/kong/kubernetes-ingress-controller/internal/manager.Commit=$(COMMIT) \
 		-X github.com/kong/kubernetes-ingress-controller/internal/manager.Repo=$(REPO_INFO)" internal/cmd/main.go
 
+.PHONY: imports
+imports:
+	@find ./ -type f -name '*.go' -exec goimports -local $(REPO_URL) -w {} \;
+
 .PHONY: fmt
 fmt:
 	go fmt ./...

internal/admission/server.go

@@ -8,13 +8,14 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	configuration "github.com/kong/kubernetes-ingress-controller/pkg/apis/configuration/v1"
 	"github.com/sirupsen/logrus"
 	admission "k8s.io/api/admission/v1"
 	corev1 "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
+
+	configuration "github.com/kong/kubernetes-ingress-controller/pkg/apis/configuration/v1"
 )
 
 var (
@@ -173,6 +174,7 @@ func (a RequestHandler) handleValidation(ctx context.Context, request admission.
 	var message string
 	var err error
 
+	//nolint:exhaustive
 	switch request.Resource {
 	case consumerGVResource:
 		consumer := configuration.KongConsumer{}

internal/admission/server_test.go

@@ -9,13 +9,14 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	configuration "github.com/kong/kubernetes-ingress-controller/pkg/apis/configuration/v1"
 	"github.com/lithammer/dedent"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	admission "k8s.io/api/admission/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	configuration "github.com/kong/kubernetes-ingress-controller/pkg/apis/configuration/v1"
 )
 
 var decoder = codecs.UniversalDeserializer()

internal/annotations/annotations_test.go

@@ -75,7 +75,8 @@ func TestIngressClassValidatorFunc(t *testing.T) {
 
 	data := map[string]string{}
 	ing.SetAnnotations(data)
-	for _, test := range tests {
+	for i := 0; i < len(tests); i++ {
+		test := tests[i]
 		ing.Annotations[IngressClassKey] = test.ingress
 		ingv1.Spec.IngressClassName = &test.ingress
 		// TODO: unclear if we truly use IngressClassValidatorFunc anymore