Merge pull request #285 from bookingcom/avereha/golangci-lint

Avereha/golangci lint

Author: avereha

.github/workflows/ci.yml

@@ -1,5 +1,9 @@
-on: [push, pull_request]
 name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 jobs:
   test:
     strategy:
@@ -20,3 +24,22 @@ jobs:
         run: make all check
       - name: integration test
         run: tests/system_test.sh
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        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.30
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          #args: --new-from-rev=f7cdb31b6a6c8
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.golangci.yml

@@ -33,11 +33,11 @@ linters-settings:
     # [deprecated] comma-separated list of pairs of the form pkg:regex
     # the regex is used to ignore names within pkg. (default "fmt:.*").
     # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    ignore: fmt:.*,io/ioutil:^Read.*
+    ignore: fmt:.*,io/ioutil:^Read.*,github.com/bradfitz/gomemcache/memcache:^Set,github.com/bookingcom/carbonapi/pkg/prioritylimiter:Leave,github.com/bookingcom/carbonapi/cache:Set
 
     # path to a file containing a list of functions to exclude from checking
     # see https://github.com/kisielk/errcheck#excluding-functions for details
-    # exclude: /path/to/file.txt
+    #exclude:
   govet:
     # report about shadowed variables
     check-shadowing: true
@@ -138,6 +138,8 @@ linters-settings:
         paramsOnly: true
       rangeValCopy:
         sizeThreshold: 32
+  exhaustive:
+    default-signifies-exhaustive: true
 
 linters:
   enable:
@@ -175,6 +177,7 @@ issues:
         - errcheck
         - dupl
         - gosec
+        - noctx
 
     # Exclude known linters from partially hard-vendored code,
     # which is impossible to exclude via "nolint" comments.

Makefile

@@ -37,12 +37,6 @@ vet:
 	go vet -composites=false ./...
 
 lint:
-# Show only issues introduced since switching from gometalinter to
-# golangci-lint.  The commit b5dd153 was the merge-base on master at the time.
-# This is not in .golangci.yml in order to show all the gore when run directly.
-	golangci-lint run --new-from-rev 9ce419bc428b76f1505230e501546e2245374c94
-
-lint-all:
 	golangci-lint run
 
 check: test vet

app/carbonapi/app.go

@@ -106,7 +106,7 @@ func (app *App) Start() func() {
 
 	handler := initHandlers(app)
 
-	prometheusServer := app.registerPrometheusMetrics(logger)
+	prometheusServer := app.registerPrometheusMetrics()
 
 	app.requestBlocker.ScheduleRuleReload()
 
@@ -125,20 +125,7 @@ func (app *App) Start() func() {
 	return flush
 }
 
-func recoveryHandler(h http.Handler, lg *zap.Logger) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer func() {
-			if r := recover(); r != nil {
-				http.Error(w, "recovered from panic", http.StatusInternalServerError)
-				lg.Error("recovered from panic", zap.Any("details", r))
-			}
-		}()
-
-		h.ServeHTTP(w, r)
-	})
-}
-
-func (app *App) registerPrometheusMetrics(logger *zap.Logger) *http.Server {
+func (app *App) registerPrometheusMetrics() *http.Server {
 	prometheus.MustRegister(app.prometheusMetrics.Requests)
 	prometheus.MustRegister(app.prometheusMetrics.Responses)
 	prometheus.MustRegister(app.prometheusMetrics.FindNotFound)
@@ -426,16 +413,11 @@ var timeBuckets []int64
 var expTimeBuckets []int64
 
 type bucketEntry int
-type expBucketEntry int
 
 func (b bucketEntry) String() string {
 	return strconv.Itoa(int(atomic.LoadInt64(&timeBuckets[b])))
 }
 
-func (b expBucketEntry) String() string {
-	return strconv.Itoa(int(atomic.LoadInt64(&expTimeBuckets[b])))
-}
-
 func renderTimeBuckets() interface{} {
 	return timeBuckets
 }

app/carbonapi/app_test.go

@@ -235,6 +235,7 @@ func renderHandlerErrs(t *testing.T) {
 	}
 
 	for _, tst := range tests {
+		tst := tst
 		t.Run(tst.req, func(t *testing.T) {
 			req := httptest.NewRequest("GET", tst.req, nil)
 			rr := httptest.NewRecorder()