From f898098fb44a1b08a75ef8f1b65e7d0f0fd85d4c Mon Sep 17 00:00:00 2001
From: Laurent Demailly <ldemailly@gmail.com>
Date: Wed, 10 Jul 2024 13:21:49 -0700
Subject: [PATCH 1/2] adapt settings to golangci-lint  1.59.1

---
 golangci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/golangci.yml b/golangci.yml
index 6a3a455..22de120 100644
--- a/golangci.yml
+++ b/golangci.yml
@@ -73,6 +73,7 @@ linters:
     - musttag
     # Deprecated ones:
     - gomnd
+    - execinquery
     # Weird/bad ones:
     - wsl
     - nlreturn
@@ -81,7 +82,6 @@ linters:
     - mnd
     - testpackage
     - wrapcheck
-    - exhaustivestruct
     - tagliatelle
     - nonamedreturns
     - varnamelen
@@ -90,7 +90,6 @@ linters:
     - paralleltest
     - thelper
     - forbidigo
-    - ifshort
     - wastedassign
     - cyclop
     - forcetypeassert

From 074ee1633263c4f582ff08ed55f921c114de398e Mon Sep 17 00:00:00 2001
From: Laurent Demailly <ldemailly@gmail.com>
Date: Wed, 10 Jul 2024 16:29:28 -0700
Subject: [PATCH 2/2] review comment

---
 golangci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/golangci.yml b/golangci.yml
index 22de120..8342a4a 100644
--- a/golangci.yml
+++ b/golangci.yml
@@ -58,6 +58,7 @@ linters-settings:
     max-func-lines: 30
   nolintlint:
     require-specific: true
+    # require-explanation: true # add this when we fix it/review nolints in fortio/fortio
   whitespace:
     multi-if: false   # Enforces newlines (or comments) after every multi-line if statement
     multi-func: false # Enforces newlines (or comments) after every multi-line function signature
@@ -74,6 +75,8 @@ linters:
     # Deprecated ones:
     - gomnd
     - execinquery
+    # Redundant ones:
+    - gofmt # we use gofumpt
     # Weird/bad ones:
     - wsl
     - nlreturn