upgrade golangci-lint, fix superflous else, ignore unused-parameter i…

…ssues

Signed-off-by: Matt Trachier <matttrach@gmail.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>

.golangci.json

@@ -20,6 +20,10 @@
 			{
 				"linters": "revive",
 				"text": "should have comment"
+			},
+			{
+				"linters": "revive",
+				"text": "unused-parameter"
 			}
 		]
 	}

Dockerfile.dapper

@@ -7,7 +7,7 @@ RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.9.5
 RUN rm -rf /go/src /go/pkg
 
 RUN if [ "${ARCH}" == "amd64" ]; then \
-    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/v1.50.0/install.sh | sh -s;  \
+    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/v1.52.2/install.sh | sh -s;  \
     fi
 
 ENV DAPPER_RUN_ARGS --privileged -v kine-cache:/go/src/github.com/k3s-io/kine/.cache

pkg/logstructured/sqllog/sql.go

@@ -149,11 +149,10 @@ outer:
 				// last iteration because another client has compacted, or the requested revision has already been compacted.
 				if err == server.ErrCompacted {
 					break
-				} else {
-					logrus.Errorf("Compact failed: %v", err)
-					metrics.CompactTotal.WithLabelValues(metrics.ResultError).Inc()
-					continue outer
 				}
+				logrus.Errorf("Compact failed: %v", err)
+				metrics.CompactTotal.WithLabelValues(metrics.ResultError).Inc()
+				continue outer
 			}
 		}