Use golangci-lint 2.x (#207)

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

@@ -45,7 +45,7 @@ endif
 ### These variables should not need tweaking.
 ###
 
-SRC_PKGS := elasticsearch elasticsearchdashboard mariadb mongodb mysql oracle perconaxtradb pgbouncer postgres proxysql redis redissentinel pgpool
+SRC_PKGS := cassandra clickhouse db2 druid elasticsearch elasticsearchdashboard hack hazelcast ignite kafka mariadb memcached mongodb mssqlserver mysql neo4j oracle perconaxtradb pgbouncer pgpool postgres proxysql qdrant rabbitmq redis redissentinel singlestore solr zookeeper
 SRC_DIRS := $(SRC_PKGS)
 
 DOCKER_PLATFORMS := linux/amd64 linux/arm linux/arm64
@@ -177,8 +177,6 @@ test: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_PKGS)                          \
 	    "
 
-ADDTL_LINTERS   := gofmt,goimports,unparam
-
 .PHONY: lint
 lint: $(BUILD_DIRS)
 	@echo "running linter"
@@ -196,7 +194,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

cassandra/client.go

@@ -97,6 +97,6 @@ func (c *Client) PingCassandra() error {
 
 func (c *Client) CloseCassandraClient() {
 	if c != nil {
-		c.Close()
+		c.Close() // nolint:errcheck
 	}
 }

cassandra/kubedb_client_builder.go

@@ -23,14 +23,14 @@ import (
 	"errors"
 	"fmt"
 
+	"kubedb.dev/apimachinery/apis/kubedb"
+	api "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
+
+	"github.com/gocql/gocql"
 	core "k8s.io/api/core/v1"
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
-	"kubedb.dev/apimachinery/apis/kubedb"
-
-	"github.com/gocql/gocql"
-	api "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -63,6 +63,7 @@ func (o *KubeDBClientBuilder) WithContext(ctx context.Context) *KubeDBClientBuil
 	o.ctx = ctx
 	return o
 }
+
 func (o *KubeDBClientBuilder) GetCassandraClient() (*Client, error) {
 	host := o.url
 	cluster := gocql.NewCluster(host)

clickhouse/kubedb_client_builder.go

@@ -21,11 +21,12 @@ import (
 	"database/sql"
 	"fmt"
 
+	"kubedb.dev/apimachinery/apis/kubedb"
+	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
+
 	_ "github.com/ClickHouse/clickhouse-go/v2"
 	core "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
-	"kubedb.dev/apimachinery/apis/kubedb"
-	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -81,7 +82,7 @@ func (o *KubeDBClientBuilder) GetClickHouseClient() (*Client, error) {
 	}
 	// ping to database to check the connection
 	if err := db.PingContext(o.ctx); err != nil {
-		closeErr := db.Close()
+		closeErr := db.Close() // nolint:errcheck
 		if closeErr != nil {
 			klog.Errorf("Failed to close client. error: %v", closeErr)
 		}

db2/kubedb_client_builder.go

@@ -7,12 +7,13 @@ import (
 	"net/http"
 	"time"
 
+	dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
+
 	"github.com/go-resty/resty/v2"
 	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
-	dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

druid/client.go

@@ -45,7 +45,7 @@ const (
 )
 
 func (c *Client) CloseDruidClient() {
-	err := c.Close()
+	err := c.Close() // nolint:errcheck
 	if err != nil {
 		klog.Error(err, "Failed to close druid middleManagers client")
 		return
@@ -103,7 +103,7 @@ func (c *Client) CheckNodeDiscoveryStatus() (bool, error) {
 func (c *Client) CheckDataSourceExistence() (bool, error) {
 	path := "druid/v2/sql"
 
-	data := map[string]interface{}{
+	data := map[string]any{
 		"query": "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'druid' AND TABLE_NAME = 'kubedb-datasource'",
 	}
 
@@ -113,7 +113,7 @@ func (c *Client) CheckDataSourceExistence() (bool, error) {
 	}
 	rawMessage := json.RawMessage(jsonData)
 
-	var result []map[string]interface{}
+	var result []map[string]any
 	_, err = c.ExecuteRequest(http.MethodPost, path, rawMessage, &result)
 	if err != nil {
 		klog.Error("Failed to execute request", err)
@@ -192,7 +192,7 @@ func (c *Client) GetData() (string, error) {
 
 func (c *Client) runSelectQuery() (string, error) {
 	path := "druid/v2/sql"
-	data := map[string]interface{}{
+	data := map[string]any{
 		"query": "SELECT * FROM \"kubedb-datasource\"",
 	}
 
@@ -202,7 +202,7 @@ func (c *Client) runSelectQuery() (string, error) {
 	}
 	rawMessage := json.RawMessage(jsonData)
 
-	var result []map[string]interface{}
+	var result []map[string]any
 	_, err = c.ExecuteRequest(http.MethodPost, path, rawMessage, &result)
 	if err != nil {
 		klog.Error("Failed to execute POST query request", err)
@@ -214,7 +214,7 @@ func (c *Client) runSelectQuery() (string, error) {
 }
 
 func (c *Client) updateCoordinatorsWaitBeforeDeletingConfig(value int32) error {
-	data := map[string]interface{}{
+	data := map[string]any{
 		"millisToWaitBeforeDeleting": value,
 	}
 	if err := c.updateCoordinatorDynamicConfig(data); err != nil {
@@ -224,7 +224,7 @@ func (c *Client) updateCoordinatorsWaitBeforeDeletingConfig(value int32) error {
 	return nil
 }
 
-func (c *Client) updateCoordinatorDynamicConfig(data map[string]interface{}) error {
+func (c *Client) updateCoordinatorDynamicConfig(data map[string]any) error {
 	path := "druid/coordinator/v1/config"
 
 	jsonData, err := json.Marshal(data)
@@ -274,7 +274,7 @@ func (c *Client) submitTask(taskType DruidTaskType, dataSource string, data stri
 	rawMessage := json.RawMessage(task)
 	path := "druid/indexer/v1/task"
 
-	var result map[string]interface{}
+	var result map[string]any
 	_, err := c.ExecuteRequest(http.MethodPost, path, rawMessage, &result)
 	if err != nil {
 		klog.Error("Failed to execute POST ingestion or kill task request", err)
@@ -339,15 +339,15 @@ func GetKillTaskDefinition() string {
 func (c *Client) CheckTaskStatus(taskID string) (bool, error) {
 	path := fmt.Sprintf("druid/indexer/v1/task/%s/status", taskID)
 
-	var result map[string]interface{}
+	var result map[string]any
 	_, err := c.ExecuteRequest(http.MethodGet, path, nil, &result)
 	if err != nil {
 		klog.Error("Failed to execute GET task status request", err)
 		return false, err
 	}
 
 	statusRes := result["status"]
-	statusMap := statusRes.(map[string]interface{})
+	statusMap := statusRes.(map[string]any)
 	status := statusMap["status"].(string)
 
 	return status == "SUCCESS", nil
@@ -375,7 +375,7 @@ func (c *Client) checkDBReadAccess(oldData string) error {
 func (c *Client) UpdateDruidPassword(password string) error {
 	path := "druid-ext/basic-security/authentication/db/basic/users/admin/credentials"
 
-	data := map[string]interface{}{
+	data := map[string]any{
 		"password": password,
 	}
 	jsonData, err := json.Marshal(data)

druid/kubedb_client_builder.go

@@ -24,15 +24,16 @@ import (
 	"fmt"
 	"net/http"
 
+	dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
+	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
+	apiutils "kubedb.dev/apimachinery/pkg/utils"
+
 	druidgo "github.com/grafadruid/go-druid"
 	_ "github.com/lib/pq"
 	core "k8s.io/api/core/v1"
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
-	dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
-	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
-	apiutils "kubedb.dev/apimachinery/pkg/utils"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

elasticsearch/api.go

@@ -174,10 +174,8 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 		return nil, -1, errors.Wrap(err, "failed to parse version")
 	}
 
-	switch {
-	case esVersion.Spec.AuthPlugin == catalog.ElasticsearchAuthPluginXpack ||
-		esVersion.Spec.AuthPlugin == catalog.ElasticsearchAuthPluginSearchGuard ||
-		esVersion.Spec.AuthPlugin == catalog.ElasticsearchAuthPluginOpenDistro:
+	switch esVersion.Spec.AuthPlugin {
+	case catalog.ElasticsearchAuthPluginXpack, catalog.ElasticsearchAuthPluginSearchGuard, catalog.ElasticsearchAuthPluginOpenDistro:
 		switch {
 		case version.Major() == 6:
 			client, err := esv6.NewClient(esv6.Config{
@@ -208,7 +206,7 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
 				return &ESClientV6{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
@@ -244,7 +242,7 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
 				return &ESClientV7{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
@@ -280,7 +278,7 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
 				return &ESClientV8{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
@@ -316,15 +314,15 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
 				return &ESClientV9{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
 			}
 			return &ESClientV9{client: client}, res.StatusCode, nil
 		}
 
-	case esVersion.Spec.AuthPlugin == catalog.ElasticsearchAuthPluginOpenSearch:
+	case catalog.ElasticsearchAuthPluginOpenSearch:
 		switch {
 		case version.Major() == 1:
 			client, err := opensearchv1.NewClient(opensearchv1.Config{
@@ -355,7 +353,7 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
 				return &OSClientV1{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
@@ -390,10 +388,10 @@ func GetElasticClient(kc kubernetes.Interface, dc cs.Interface, db *dbapi.Elasti
 			if err != nil {
 				return nil, -1, errors.Wrap(err, "Failed to perform health check")
 			}
-			defer res.Body.Close()
+			defer res.Body.Close() // nolint:errcheck
 
 			if res.IsError() {
-				return &OSClientV2{client: client}, res.StatusCode, fmt.Errorf("Health check failed with status code: %d", res.StatusCode)
+				return &OSClientV2{client: client}, res.StatusCode, fmt.Errorf("health check failed with status code: %d", res.StatusCode)
 			}
 			return &OSClientV2{client: client}, res.StatusCode, nil
 		}
@@ -453,28 +451,28 @@ type WriteRequestIndexBody struct {
 }
 
 type ESClient interface {
-	ClusterHealthInfo() (map[string]interface{}, error)
+	ClusterHealthInfo() (map[string]any, error)
 	ClusterStatus() (string, error)
 	CountData(index string) (int, error)
 	CreateDBUserRole(ctx context.Context) error
 	CreateIndex(index string) error
 	DeleteIndex(index string) error
-	GetIndicesInfo() ([]interface{}, error)
+	GetIndicesInfo() ([]any, error)
 	GetClusterWriteStatus(ctx context.Context, db *dbapi.Elasticsearch) error
 	GetClusterReadStatus(ctx context.Context, db *dbapi.Elasticsearch) error
 	GetTotalDiskUsage(ctx context.Context) (string, error)
 	GetDBUserRole(ctx context.Context) (error, bool)
 	IndexExistsOrNot(index string) error
-	NodesStats() (map[string]interface{}, error)
+	NodesStats() (map[string]any, error)
 	ShardStats() ([]ShardInfo, error)
-	PutData(index, id string, data map[string]interface{}) error
+	PutData(index, id string, data map[string]any) error
 	SyncCredentialFromSecret(secret *core.Secret) error
 	DisableShardAllocation() error
 	ReEnableShardAllocation() error
 	CheckVersion() (string, error)
 	GetClusterStatus() (string, error)
 	CountIndex() (int, error)
-	GetData(_index, _type, _id string) (map[string]interface{}, error)
+	GetData(_index, _type, _id string) (map[string]any, error)
 	CountNodes() (int64, error)
 	AddVotingConfigExclusions(nodes []string) error
 	DeleteVotingConfigExclusions() error