From e8227bd21a0eaeddf5e8e9477163db1a35a0bda7 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Fri, 27 Jan 2023 15:50:04 -0500
Subject: [PATCH] fix: get linter running correctly locally

---
 .golangci.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 31b7bdadc2..f266dd9f99 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -14,10 +14,12 @@ run:
     - "bin"
     - "_tools"
     - "dist"
-    - "rpc"
-    - "swagger"
+    - "rpc/flipt"
     - "ui"
 
+  skip-files:
+    - ".*pb.go"
+
   # which files to skip: they will be analyzed, but issues from them
   # won't be reported. Default value is empty list, but there is
   # no need to include all autogenerated files, we confidently recognize
@@ -30,7 +32,6 @@ linters:
     - errcheck
     - goconst
     - gocritic
-    - goimports
     - gosec
     - gosimple
     - govet
@@ -39,12 +40,12 @@ linters:
     - misspell
     - staticcheck
     - stylecheck
+    - sqlclosecheck
     - unconvert
     - unparam
   disable:
     - contextcheck
     - exhaustive
-    - rowserrcheck
   enable-all: false
   presets:
     - bugs
@@ -68,6 +69,10 @@ linters-settings:
     checks:
       - all
       - "-SA1019" # exclude staticcheck messages from github.com/golang/protobuf
+  stylecheck:
+    checks:
+      - all
+      - "-ST1003" # exclude underscores
   gosec:
     excludes: # exclude gosec messages about weak crypto
       - "G501"