Update golangci-lint and fix various things

.github/workflows/golangci-lint.yml

@@ -14,9 +14,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '^1.22'
+          go-version: '^1.23'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.57.1
+          version: v1.51.0
           args: cli/... discern/... elan/... flair/... grpcutil/... lucidity/... mettle/... purity/... rexclient/... zeal/...

.golangci.yml

@@ -1,8 +1,5 @@
 run:
   timeout: 5m
-  skip-dirs:
-    - plz-out/
-    - tests/
 
 issues:
   exclude:
@@ -18,6 +15,9 @@ issues:
     - unused-parameter # Quite a few of these, some legit, many are fulfilling interfaces
     - redefines-builtin # Not really a big issue
     - empty-block # Only came up once and was a false positive. This should be easily handled by review.
+  exclude-dirs:
+    - plz-out/
+    - tests/
   exclude-rules:
     - path: _test\.go
       linters:
@@ -36,7 +36,7 @@ linters:
     - bodyclose
     - dogsled
     - dupl
-    - exportloopref
+    - copyloopvar
     - gocritic
     - gofmt
     - revive

mettle/worker/download.go

@@ -187,8 +187,6 @@ func (w *worker) downloadAllFiles(files map[sdkdigest.Digest][]fileNode, packs m
 		g.Go(func() error { return w.downloadFiles(fileNodes) })
 	}
 	for dg, paths := range packs {
-		dg := dg
-		paths := paths
 		g.Go(func() error {
 			return w.downloadPack(dg, paths)
 		})

mettle/worker/reporting.go

@@ -173,15 +173,21 @@ func (w *worker) checkLiveConnection() bool {
 func (w *worker) checkConnectivity(check string) {
 	switch check {
 	case "gstatic":
-		if resp, err := http.Get("https://connectivitycheck.gstatic.com/generate_204"); err != nil {
+		resp, err := http.Get("https://connectivitycheck.gstatic.com/generate_204")
+		if err != nil {
 			log.Fatalf("Failed to complete connectivity check: %s", err)
-		} else if resp.StatusCode != http.StatusNoContent {
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode != http.StatusNoContent {
 			log.Fatalf("Connectivity check returned unexpected status: %s", resp.Status)
 		}
 	case "firefox":
-		if resp, err := http.Get("https://detectportal.firefox.com/canonical.html"); err != nil {
+		resp, err := http.Get("https://detectportal.firefox.com/canonical.html")
+		if err != nil {
 			log.Fatalf("Failed to complete connectivity check: %s", err)
-		} else if resp.StatusCode != http.StatusOK {
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode != http.StatusOK {
 			log.Fatalf("Connectivity check returned unexpected status: %s", resp.Status)
 		}
 	case "":

mettle/worker/worker.go

@@ -242,7 +242,7 @@ func runForever(instanceName, requestQueue, responseQueue, name, storage, dir, c
 			// our queues or something else bad happened internally  so we are basically doomed
 			// and should stop.
 			err = fmt.Errorf("Failed to run task: %s", err)
-			w.Report(false, false, false, err.Error())
+			w.Report(false, false, false, "%s", err)
 			return err
 		}
 	}
@@ -533,7 +533,7 @@ func (w *worker) runTask(msg *pubsub.Message) *pb.ExecuteResponse {
 
 // forceShutdown sends any shutdown reports and calls log.Fatal() to shut down the worker
 func (w *worker) forceShutdown(shutdownMsg string) {
-	w.Report(false, false, false, shutdownMsg)
+	w.Report(false, false, false, "%s", shutdownMsg)
 	log.Info("Force shutting down worker")
 	if w.currentMsg != nil {
 		if w.actionDigest != nil {
@@ -901,7 +901,7 @@ func (w *worker) writeUncachedResult(ar *pb.ActionResult, msg string) string {
 	b, _ := proto.Marshal(&bbcas.UncachedActionResult{
 		ActionDigest: w.actionDigest,
 		ExecuteResponse: &pb.ExecuteResponse{
-			Status: status(nil, codes.Unknown, msg),
+			Status: status(nil, codes.Unknown, "%s", msg),
 			Result: ar,
 		},
 	})
@@ -1075,7 +1075,7 @@ func (w *worker) collectOutputs(ar *pb.ActionResult, cmd *pb.Command) error {
 
 // update sends an update on the response channel
 func (w *worker) update(stage pb.ExecutionStage_Value, response *pb.ExecuteResponse) error {
-	w.Report(true, stage == pb.ExecutionStage_EXECUTING, true, stage.String())
+	w.Report(true, stage == pb.ExecutionStage_EXECUTING, true, "%s", stage)
 	body := common.MarshalOperation(stage, w.actionDigest, response, w.metadata)
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancel()