Merge pull request #312 from go-graphite/feat/add_linters

feat(ci): Added linters

Author: Vladimir Smirnov

.github/workflows/lint.yml

@@ -0,0 +1,20 @@
+name: Lint
+on:
+  pull_request:
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - name: Run linter
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.0.2
+

.golangci.yml

@@ -0,0 +1,97 @@
+version: "2"
+linters:
+  default: none
+  enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+#    - contextcheck
+    - decorder
+#    - dogsled
+    - durationcheck
+#    - errcheck
+#    - errorlint
+#    - fatcontext
+    - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecksumtype
+#    - goconst
+#    - gocyclo
+#    - godot
+    - goheader
+    - govet
+    - grouper
+#    - ineffassign
+    - loggercheck
+#    - makezero
+#    - misspell
+#    - mnd
+#    - nilerr
+#    - noctx
+#    - nosprintfhostport
+    - prealloc
+#    - predeclared
+    - promlinter
+    - protogetter
+    - reassign
+#    - revive
+    - rowserrcheck
+    - sloglint
+    - spancheck
+    - sqlclosecheck
+#    - staticcheck
+#    - testifylint
+    - tparallel
+    - unconvert
+#    - unparam
+#    - unused
+    - usestdlibvars
+#    - wastedassign
+    - whitespace
+#    - wsl
+  settings:
+    gocyclo:
+      min-complexity: 15
+    govet:
+      settings:
+        printf:
+          funcs:
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+    unparam:
+      check-exported: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - errcheck
+          - contextcheck
+          - goconst
+          - mnd
+        path: _test\.go
+      - linters:
+          - godot
+        path: notifier/registrator.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+#    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -117,3 +117,7 @@ md5sum:
 
 sha256sum:
 	sha256sum $(wildcard $(NAME)_$(VERSION)*.deb) $(wildcard $(NAME)-$(VERSION)*.rpm) > sha256sum
+
+.PHONY: lint
+lint:
+	golangci-lint run

cmd/e2e-test/checks.go

@@ -299,7 +299,6 @@ func verifyRender(ch *Clickhouse, gch *GraphiteClickhouse, check *RenderCheck, d
 	from := datetime.TimestampTruncate(check.from, defaultPreision)
 	until := datetime.TimestampTruncate(check.until, defaultPreision)
 	for _, format := range check.Formats {
-
 		var filteringFunctions []*carbonapi_v3_pb.FilteringFunction
 		if format == client.FormatPb_v3 {
 			var err error

cmd/e2e-test/clickhouse.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"os/exec"
@@ -14,9 +14,11 @@ import (
 	"github.com/msaf1980/go-stringutils"
 )
 
-var ClickhouseContainerName = "clickhouse-server-gch-test"
-var ClickhouseOldImage = "yandex/clickhouse-server"
-var ClickhouseDefaultImage = "clickhouse/clickhouse-server"
+var (
+	ClickhouseContainerName = "clickhouse-server-gch-test"
+	ClickhouseOldImage      = "yandex/clickhouse-server"
+	ClickhouseDefaultImage  = "clickhouse/clickhouse-server"
+)
 
 type Clickhouse struct {
 	Version    string `toml:"version"`
@@ -168,7 +170,7 @@ func (c *Clickhouse) Exec(sql string) (bool, string) {
 
 func (c *Clickhouse) Query(sql string) (string, error) {
 	reader := strings.NewReader(sql)
-	request, err := http.NewRequest("POST", c.URL(), reader)
+	request, err := http.NewRequest(http.MethodPost, c.URL(), reader)
 	if err != nil {
 		return "", err
 	}
@@ -177,7 +179,9 @@ func (c *Clickhouse) Query(sql string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	msg, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+
+	msg, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}
@@ -195,6 +199,8 @@ func (c *Clickhouse) Alive() bool {
 	if err != nil {
 		return false
 	}
+	defer req.Body.Close()
+
 	return req.StatusCode == http.StatusOK
 }
 

cmd/graphite-clickhouse-client/main.go

@@ -90,7 +90,7 @@ func main() {
 			formatFind = client.FormatPb_v3
 		}
 
-		queryRaw, r, respHeader, err := client.MetricsFind(&httpClient, *address, formatFind, *metricsFind, int64(from), int64(until))
+		queryRaw, r, respHeader, err := client.MetricsFind(&httpClient, *address, formatFind, *metricsFind, from, until)
 		if respHeader != nil {
 			fmt.Printf("Responce header: %+v\n", respHeader)
 		}
@@ -123,7 +123,7 @@ func main() {
 		if formatTags == client.FormatDefault {
 			formatTags = client.FormatJSON
 		}
-		queryRaw, r, respHeader, err := client.TagsValues(&httpClient, *address, formatTags, *tagsValues, *limit, int64(from), int64(until))
+		queryRaw, r, respHeader, err := client.TagsValues(&httpClient, *address, formatTags, *tagsValues, *limit, from, until)
 		if respHeader != nil {
 			fmt.Printf("Responce header: %+v\n", respHeader)
 		}
@@ -156,7 +156,7 @@ func main() {
 		if formatTags == client.FormatDefault {
 			formatTags = client.FormatJSON
 		}
-		queryRaw, r, respHeader, err := client.TagsNames(&httpClient, *address, formatTags, *tagsNames, *limit, int64(from), int64(until))
+		queryRaw, r, respHeader, err := client.TagsNames(&httpClient, *address, formatTags, *tagsNames, *limit, from, until)
 		if respHeader != nil {
 			fmt.Printf("Responce header: %+v\n", respHeader)
 		}
@@ -178,7 +178,6 @@ func main() {
 			} else {
 				fmt.Println("[]")
 			}
-
 		} else {
 			ec = 1
 			fmt.Printf("'%s'\n", strings.TrimRight(err.Error(), "\n"))
@@ -190,7 +189,7 @@ func main() {
 		if formatRender == client.FormatDefault {
 			formatRender = client.FormatPb_v3
 		}
-		queryRaw, r, respHeader, err := client.Render(&httpClient, *address, formatRender, targets, []*carbonapi_v3_pb.FilteringFunction{}, maxDataPoints, int64(from), int64(until))
+		queryRaw, r, respHeader, err := client.Render(&httpClient, *address, formatRender, targets, []*carbonapi_v3_pb.FilteringFunction{}, maxDataPoints, from, until)
 		if respHeader != nil {
 			fmt.Printf("Responce header: %+v\n", respHeader)
 		}
@@ -216,7 +215,6 @@ func main() {
 			} else {
 				fmt.Println("[]")
 			}
-
 		} else {
 			ec = 1
 			fmt.Printf("'%s'\n", strings.TrimRight(err.Error(), "\n"))

config/config.go

@@ -448,7 +448,6 @@ func (ir IndexReverses) Compile() error {
 		if _, ok := IndexReverse[n.Reverse]; !ok {
 			return fmt.Errorf("%s is not valid value for index-reverses.reverse", n.Reverse)
 		}
-
 	}
 	return nil
 }
@@ -549,11 +548,9 @@ func Unmarshal(body []byte, exactConfig bool) (cfg *Config, warns []zap.Field, e
 		decoder.Strict(exactConfig)
 
 		err := decoder.Decode(cfg)
-
 		if err != nil {
 			return nil, nil, err
 		}
-
 	}
 
 	if cfg.Logging == nil {

find/handler_test.go

@@ -22,7 +22,6 @@ func (m *clickhouseMock) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func TestFind(t *testing.T) {
-
 	testCase := func(findQuery, expectedClickHouseQuery string) {
 		requestLog := make(chan []byte, 1)
 		m := &clickhouseMock{
@@ -38,7 +37,7 @@ func TestFind(t *testing.T) {
 		handler := NewHandler(cfg)
 		w := httptest.NewRecorder()
 		r := httptest.NewRequest(
-			"GET",
+			http.MethodGet,
 			"http://localhost/metrics/find/?local=1&format=pickle&query="+findQuery,
 			nil,
 		)

finder/plain_from_tagged_test.go

@@ -36,5 +36,4 @@ func TestPlainFromTaggedFinderAbs(t *testing.T) {
 	for _, c := range table {
 		assert.Equal(c[1], string(f.Abs([]byte(c[0]))))
 	}
-
 }

finder/tagged.go

@@ -446,7 +446,6 @@ func (t *TaggedFinder) whereFilter(terms []TaggedTerm, from int64, until int64)
 			date.UntilTimestampToDaysFormat(until),
 		)
 	} else {
-
 		w.Andf(
 			"Date >='%s'",
 			date.FromTimestampToDaysFormat(from),
@@ -632,7 +631,6 @@ func (t *TaggedFinder) SetCostsFromCountTable(ctx context.Context, terms []Tagge
 			date.UntilTimestampToDaysFormat(until),
 		)
 	} else {
-
 		w.Andf(
 			"Date >= '%s'",
 			date.FromTimestampToDaysFormat(from),