Bump golangci-lint

To avoid memory leak / timeout.

Fix up depguard config. Fix a formatting error. Leave one linter error
in place for now, it'll be fixed in a subsequent commit, as it's a bit
more complex.

Author: Craig Furman

.golangci.yml

@@ -17,14 +17,19 @@ linters:
 
 linters-settings:
   depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages-with-error-message:
-      - errors: 'Use github.com/sourcegraph/sourcegraph/lib/errors instead'
-      - github.com/pkg/errors: 'Use github.com/sourcegraph/sourcegraph/lib/errors instead'
-      - github.com/cockroachdb/errors: 'Use github.com/sourcegraph/sourcegraph/lib/errors instead'
-      - github.com/hashicorp/go-multierror: 'Use github.com/sourcegraph/sourcegraph/lib/errors instead'
-      - io/ioutil: 'The ioutil package has been deprecated'
+    rules:
+      main:
+        deny:
+          - pkg: "errors"
+            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
+          - pkg: "github.com/pkg/errors"
+            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
+          - pkg: "github.com/cockroachdb/errors"
+            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
+          - pkg: "github.com/hashicorp/go-multierror"
+            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
+          - pkg: "io/ioutil"
+            desc: "The ioutil package has been deprecated"
   gocritic:
     disabled-checks:
       - appendAssign # Too many false positives

dev/golangci-lint.sh

@@ -6,7 +6,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null
 
 mkdir -p dev/.bin
 
-version="1.51.2"
+version="1.58.1"
 suffix="${version}-$(go env GOOS)-$(go env GOARCH)"
 target="$PWD/dev/.bin/golangci-lint-${suffix}"
 url="https://github.com/golangci/golangci-lint/releases/download/v${version}/golangci-lint-${suffix}.tar.gz"

internal/batches/ui/task_exec_tui_test.go

@@ -50,7 +50,7 @@ func TestTaskExecTUI_Integration(t *testing.T) {
 
 	buf := &ttyBuf{}
 
-    true_ := true
+	true_ := true
 	out := output.NewOutput(buf, output.OutputOpts{
 		ForceTTY:    &true_,
 		ForceColor:  true,
@@ -210,7 +210,7 @@ func TestProgressUpdateAfterComplete(t *testing.T) {
 	now := time.Now()
 	clock := func() time.Time { return now.UTC().Truncate(time.Millisecond) }
 
-    true_ := true
+	true_ := true
 	out := output.NewOutput(buf, output.OutputOpts{
 		ForceTTY:    &true_,
 		ForceColor:  true,