Use golangci-lint 2.x (#579)

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

.golangci.yml

@@ -0,0 +1,28 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - client
+    - vendor
+
+run:
+  timeout: 10m

Makefile

@@ -391,8 +391,6 @@ unit-tests: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_PKGS)                          \
 	    "
 
-ADDTL_LINTERS   := gofmt,goimports,unparam
-
 .PHONY: lint
 lint: $(BUILD_DIRS)
 	@echo "running linter"
@@ -410,7 +408,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --max-same-issues=100 --timeout=60m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

apis/core/fuzzer/fuzzer.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		// v1alpha1
 		func(s *v1alpha1.PodView, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again

apis/identity/fuzzer/fuzzer.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		// v1alpha1
 		func(s *v1alpha1.ClusterIdentity, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again

apis/management/fuzzer/fuzzer.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		func(s *v1alpha1.ProjectQuota, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},

apis/meta/fuzzer/fuzzer.go

@@ -25,8 +25,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		func(s *v1alpha1.ResourceDescriptor, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},

apis/meta/v1alpha1/schema.go

@@ -194,7 +194,7 @@ func FormatMetadata(data []byte) ([]byte, error) {
 	return yaml.Marshal(root)
 }
 
-func find(node yaml.MapSlice, key string) interface{} {
+func find(node yaml.MapSlice, key string) any {
 	for i := range node {
 		if node[i].Key.(string) == key {
 			return node[i].Value

apis/meta/v1alpha1/table_types.go

@@ -52,9 +52,9 @@ type TableCell struct {
 	// cells will be as wide as the column definitions array and may contain strings, numbers (float64 or
 	// int64), booleans, simple maps, lists, or null. See the type field of the column definition for a
 	// more detailed description.
-	Data interface{} `json:"data"`
+	Data any `json:"data"`
 	// +optional
-	Sort interface{} `json:"sort,omitempty"`
+	Sort any `json:"sort,omitempty"`
 	// +optional
 	Link string `json:"link,omitempty"`
 	// +optional

apis/node/fuzzer/fuzzer.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		func(s *v1alpha1.NodeTopology, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},

apis/shared/helpers.go

@@ -37,14 +37,15 @@ const (
 )
 
 var pool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		return new(bytes.Buffer)
 	},
 }
 
-func (r ResourceLocator) GraphQuery(oid kmapi.OID) (string, map[string]interface{}, error) {
-	if r.Query.Type == GraphQLQuery {
-		vars := map[string]interface{}{
+func (r ResourceLocator) GraphQuery(oid kmapi.OID) (string, map[string]any, error) {
+	switch r.Query.Type {
+	case GraphQLQuery:
+		vars := map[string]any{
 			GraphQueryVarSource:      string(oid),
 			GraphQueryVarTargetGroup: r.Ref.Group,
 			GraphQueryVarTargetKind:  r.Ref.Kind,
@@ -61,7 +62,7 @@ func (r ResourceLocator) GraphQuery(oid kmapi.OID) (string, map[string]interface
     }
   }
 }`, r.Query.ByLabel), vars, nil
-	} else if r.Query.Type == RESTQuery {
+	case RESTQuery:
 		if r.Query.Raw == "" || !strings.Contains(r.Query.Raw, "{{") {
 			return r.Query.Raw, nil, nil
 		}