From 1de9907ed1191bea939a05f76a7acb7c4b5b5fbd Mon Sep 17 00:00:00 2001
From: Nicholas Wiersma <nick@wiersma.co.za>
Date: Mon, 6 May 2024 20:20:02 +0200
Subject: [PATCH] chore: bump linter version

---
 .github/workflows/test.yml |  2 +-
 .golangci.yml              | 21 ++++++++++-----------
 LICENCE                    |  2 +-
 go.mod                     |  4 ++--
 go.sum                     |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d65d73ca..8967e465 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
         go-version: [ "1.21", "1.22" ]
     runs-on: ubuntu-latest
     env:
-      GOLANGCI_LINT_VERSION: v1.57.0
+      GOLANGCI_LINT_VERSION: v1.58.0
 
     steps:
       - name: Install Go
diff --git a/.golangci.yml b/.golangci.yml
index 2c8e2d16..e3e2dc55 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -9,22 +9,21 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - interfacebloat
-    - sqlclosecheck # not relevant (SQL)
-    - rowserrcheck # not relevant (SQL)
-    - execinquery # not relevant (SQL)
-    - interfacer # deprecated
-    - scopelint # deprecated
-    - maligned # deprecated
-    - golint # deprecated
+    - cyclop # duplicate of gocyclo
     - deadcode # deprecated
+    - execinquery # deprecated
     - exhaustivestruct # deprecated
+    - golint # deprecated
+    - gomnd # deprecated
     - ifshort # deprecated
+    - interfacer # deprecated
+    - maligned # deprecated
     - nosnakecase # deprecated
+    - scopelint # deprecated
     - structcheck # deprecated
     - varcheck # deprecated
-    - cyclop # duplicate of gocyclo
     - depguard
+    - err113
     - exhaustive
     - exhaustruct
     - forcetypeassert
@@ -34,11 +33,11 @@ linters:
     - gocognit
     - goconst
     - gocyclo
-    - goerr113
-    - gomnd
     - gosmopolitan
     - inamedparam
+    - interfacebloat
     - ireturn
+    - mnd
     - nestif
     - nlreturn
     - nonamedreturns
diff --git a/LICENCE b/LICENCE
index 077af637..7ab55a48 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Nicholas Wiersma
+Copyright (c) 2024 Nicholas Wiersma
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/go.mod b/go.mod
index 4586f114..4f73e9ca 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,8 @@ require (
 	github.com/klauspost/compress v1.17.8
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/modern-go/reflect2 v1.0.2
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/tools v0.20.0
 )
 
 require (
@@ -17,6 +18,5 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 3db61f1f..3e7c3e1e 100644
--- a/go.sum
+++ b/go.sum
@@ -21,14 +21,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
 golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=