make lint happy

Author: yuzhichang

.github/workflows/lint.yml

@@ -16,13 +16,13 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.33
+          version: v1.37
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          args: --issues-exit-code=0 --disable=nakedret,exhaustivestruct,wrapcheck,paralleltest,rowserrcheck
+          args: --issues-exit-code=0 --disable=nakedret,exhaustivestruct,wrapcheck,paralleltest,rowserrcheck,cyclop
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

Makefile

@@ -25,7 +25,7 @@ benchtest: pre
 systest: build
 	bash go.test.sh
 lint:
-	golangci-lint run --issues-exit-code=0 --disable=nakedret,exhaustivestruct,wrapcheck,paralleltest,rowserrcheck
+	golangci-lint run --issues-exit-code=0 --disable=nakedret,exhaustivestruct,wrapcheck,paralleltest,rowserrcheck,cyclop
 run: pre
 	go run cmd/clickhouse_sinker/main.go --local-cfg-dir conf/
 

cmd/clickhouse_sinker/main.go

@@ -115,7 +115,7 @@ func initCmdOptions() {
 func init() {
 	initCmdOptions()
 	if cmdOps.ShowVer {
-		config.PrintSinkerInfo()
+		log.Infoln(config.GetSinkerInfo())
 		os.Exit(0)
 	}
 	selfIP = util.GetOutboundIP().String()

config/build.go

@@ -5,16 +5,17 @@ import "fmt"
 var (
 	// SinkerReleaseVersion information.
 	SinkerReleaseVersion = "None"
-	SinkerBuildTS        = "None"
+	SinkerEdition        = "None"
 	SinkerGitHash        = "None"
 	SinkerGitBranch      = "None"
-	SinkerEdition        = "None"
+	SinkerBuildTS        = "None"
 )
 
-func PrintSinkerInfo() {
-	fmt.Println("Release Version:", SinkerReleaseVersion)
-	fmt.Println("Edition:", SinkerEdition)
-	fmt.Println("Git Commit Hash:", SinkerGitHash)
-	fmt.Println("Git Branch:", SinkerGitBranch)
-	fmt.Println("UTC Build Time: ", SinkerBuildTS)
+func GetSinkerInfo() string {
+	return fmt.Sprintf("Release Version: %s, Edition: %s, Git Commit Hash: %s, Git Branch: %s, Build At: %s",
+		SinkerReleaseVersion,
+		SinkerEdition,
+		SinkerGitHash,
+		SinkerGitBranch,
+		SinkerBuildTS)
 }

output/clickhouse.go

@@ -64,10 +64,7 @@ func (c *ClickHouse) Init() (err error) {
 	if err = pool.InitConn(chCfg.Hosts, chCfg.Port, chCfg.DB, chCfg.Username, chCfg.Password, chCfg.DsnParams); err != nil {
 		return
 	}
-	if err = c.initSchema(); err != nil {
-		return err
-	}
-	return nil
+	return c.initSchema()
 }
 
 // Send a batch to clickhouse

util/common.go

@@ -162,8 +162,7 @@ func EnvIntVar(value *int, key string) {
 
 func EnvBoolVar(value *bool, key string) {
 	realKey := strings.ReplaceAll(strings.ToUpper(key), "-", "_")
-	_, found := os.LookupEnv(realKey)
-	if found {
+	if _, found := os.LookupEnv(realKey); found {
 		*value = true
 	}
 }

util/common_test.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -19,6 +18,6 @@ func TestJksToPem(t *testing.T) {
 		}
 		certPemPath, keyPemPath, err = JksToPem(jksPath, jksPassword, true)
 		require.Nil(t, err, "err should be nothing")
-		fmt.Printf("converted %s to %s, %s\n", jksPath, certPemPath, keyPemPath)
+		t.Logf("converted %s to %s, %s\n", jksPath, certPemPath, keyPemPath)
 	}
 }