From 92c739c2dbf25c633379aa8ff745065a333881f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Matczuk?= <michal@scylladb.com>
Date: Thu, 16 Apr 2020 12:18:01 +0200
Subject: [PATCH] makefile: Update golang CI lint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Matczuk <michal@scylladb.com>
---
 .golangci.yml     | 12 ++++++++++--
 Makefile          |  2 +-
 gocqlxtest/doc.go |  6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 gocqlxtest/doc.go

diff --git a/.golangci.yml b/.golangci.yml
index 560b540..d2a90a8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,6 @@
 run:
   deadline: 5m
   tests: false
-  silent: true
 
 linters-settings:
   errcheck:
@@ -13,6 +12,13 @@ linters-settings:
       - diagnostic
       - performance
       - style
+    disabled-checks:
+      - commentedOutCode
+      - evalOrder
+      - hugeParam
+      - importShadow
+      - yodaStyleExpr
+      - whyNoLint
   lll:
     line-length: 180
 
@@ -22,10 +28,12 @@ linters:
     - funlen
     - gas
     - gochecknoglobals
+    - gochecknoinits
+    - gomnd
     - interfacer
     - maligned
     - nakedret
-    - stylecheck
+    - prealloc
     - wsl
 
 issues:
diff --git a/Makefile b/Makefile
index 9b22fd8..02c3a55 100644
--- a/Makefile
+++ b/Makefile
@@ -36,4 +36,4 @@ get-deps:
 .PHONY: get-tools
 get-tools:
 	@echo "==> Installing tools at $(GOBIN)..."
-	@$(call dl_tgz,golangci-lint,https://github.com/golangci/golangci-lint/releases/download/v1.21.0/golangci-lint-1.21.0-linux-amd64.tar.gz)
+	@$(call dl_tgz,golangci-lint,https://github.com/golangci/golangci-lint/releases/download/v1.24.0/golangci-lint-1.24.0-linux-amd64.tar.gz)
diff --git a/gocqlxtest/doc.go b/gocqlxtest/doc.go
new file mode 100644
index 0000000..65370b1
--- /dev/null
+++ b/gocqlxtest/doc.go
@@ -0,0 +1,6 @@
+// Copyright (C) 2017 ScyllaDB
+// Use of this source code is governed by a ALv2-style
+// license that can be found in the LICENSE file.
+
+// Package gocqlxtest provides test helpers for integration tests.
+package gocqlxtest