chore: add ineffassign linter (#365)

* add ineffassign linter * remove ineff assign in test
ContentSquare · Oct 5, 2023 · 5190ff0 · 5190ff0
1 parent 7013cd9
commit 5190ff0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -50,13 +50,13 @@ linters:
     - govet
     - nilerr
     - wastedassign
+    - ineffassign
   disable:
     # Should be readded in the future with a dedicated PR to do the fix
     - funlen
     - gocognit
     - gofumpt
     - ifshort
-    - ineffassign
     - nestif
     - nolintlint
     - revive

diff --git a/cache/tmp_file_response_writer.go b/cache/tmp_file_response_writer.go
@@ -7,6 +7,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+
+	"github.com/contentsquare/chproxy/log"
 )
 
 // TmpFileResponseWriter caches Clickhouse response.
@@ -50,8 +52,14 @@ func (rw *TmpFileResponseWriter) Close() error {
 func (rw *TmpFileResponseWriter) GetFile() (*os.File, error) {
 	if err := rw.bw.Flush(); err != nil {
 		fn := rw.tmpFile.Name()
-		err = rw.tmpFile.Close()
-		err = os.Remove(fn)
+		errTmp := rw.tmpFile.Close()
+		if errTmp != nil {
+			log.Errorf("cannot close tmpFile: %s, error: %s", fn, errTmp)
+		}
+		errTmp = os.Remove(fn)
+		if errTmp != nil {
+			log.Errorf("cannot remove tmpFile: %s, error: %s", fn, errTmp)
+		}
 		return nil, fmt.Errorf("cannot flush data into %q: %w", fn, err)
 	}
 

diff --git a/main_test.go b/main_test.go
@@ -1138,7 +1138,7 @@ func TestNewTLSConfig(t *testing.T) {
 	if err != nil {
 		panic(fmt.Sprintf("cannot build TLS config: %s", err))
 	}
-	tlsCfg, err = cfg.BuildTLSConfig(autocertManager)
+	tlsCfg, _ = cfg.BuildTLSConfig(autocertManager)
 	if tlsCfg.GetCertificate == nil {
 		t.Fatalf("expected func GetCertificate be set; got nil")
 	}

diff --git a/scope.go b/scope.go
@@ -873,10 +873,9 @@ func (c *cluster) getReplicaSticky(sessionId string) *replica {
 	r := c.replicas[idx]
 
 	for i := uint32(1); i < n; i++ {
-		tmpIdx := (idx + i) % n
 		// handling sticky session
 		sessionId := hash(sessionId)
-		tmpIdx = (sessionId) % n
+		tmpIdx := (sessionId) % n
 		tmpRSticky := c.replicas[tmpIdx]
 		log.Debugf("Sticky replica candidate is: %s", tmpRSticky.name)
 		if !tmpRSticky.isActive() {
@@ -907,11 +906,9 @@ func (r *replica) getHostSticky(sessionId string) *topology.Node {
 
 	// Scan all the hosts for the least loaded host.
 	for i := uint32(1); i < n; i++ {
-		tmpIdx := (idx + i) % n
-
 		// handling sticky session
 		sessionId := hash(sessionId)
-		tmpIdx = (sessionId) % n
+		tmpIdx := (sessionId) % n
 		tmpHSticky := r.hosts[tmpIdx]
 		log.Debugf("Sticky server candidate is: %s", tmpHSticky)
 		if !tmpHSticky.IsActive() {