fix: lint

Author: fastcat

.vscode/settings.json

@@ -23,5 +23,6 @@
 	"gopls": {
 		"formatting.gofumpt": true,
 		"formatting.local": "fastcat.org"
-	}
+	},
+	"go.lintTool": "golangci-lint-v2"
 }

addons/gocache/http/backend.go

@@ -89,7 +89,7 @@ func (b *backend) Open(name string) (fs.File, error) {
 	}
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		_, _ = io.Copy(io.Discard, resp.Body)
-		resp.Body.Close()
+		_ = resp.Body.Close()
 		if err := statusError(resp.StatusCode); err != nil {
 			return nil, fmt.Errorf("failed to open %q: %s: %w", u, resp.Status, err)
 		}
@@ -144,20 +144,19 @@ func (b *backend) Remove(name string) error {
 	if err != nil {
 		return fmt.Errorf("failed to remove %q: %w", u, err)
 	}
+	_, _ = io.Copy(io.Discard, resp.Body)
+	_ = resp.Body.Close()
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		resp.Body.Close()
 		return fmt.Errorf("failed to remove %q: %s", u, resp.Status)
 	}
-	_, _ = io.Copy(io.Discard, resp.Body)
-	resp.Body.Close()
 	return nil
 }
 
 // Rename implements gocache.DiskDirFS.
 //
 // It requires the server to support the WebDAV MOVE method using an absolute
 // path (but not an absolute URL) for the Destination.
-func (b *backend) Rename(oldpath string, newpath string) error {
+func (b *backend) Rename(oldpath, newpath string) error {
 	u := b.fullURL(oldpath)
 	newURL := b.fullURL(newpath)
 	req, err := http.NewRequest("MOVE", u.String(), nil)
@@ -173,12 +172,11 @@ func (b *backend) Rename(oldpath string, newpath string) error {
 	if err != nil {
 		return fmt.Errorf("failed to rename %q to %q: %w", u, newURL, err)
 	}
+	_, _ = io.Copy(io.Discard, resp.Body)
+	_ = resp.Body.Close()
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		resp.Body.Close()
 		return fmt.Errorf("failed to rename %q to %q: %s", u, newURL, resp.Status)
 	}
-	_, _ = io.Copy(io.Discard, resp.Body)
-	resp.Body.Close()
 	return nil
 }
 
@@ -194,7 +192,8 @@ func (b *backend) Stat(name string) (fs.FileInfo, error) {
 		return nil, fmt.Errorf("failed to stat %q: %w", u, err)
 	}
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		resp.Body.Close()
+		_, _ = io.Copy(io.Discard, resp.Body)
+		_ = resp.Body.Close()
 		return nil, fmt.Errorf("failed to stat %q: %s", u, resp.Status)
 	}
 	return &readerInfo{resp: resp}, nil

addons/gocache/http/server/main.go

@@ -29,13 +29,13 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	defer os.RemoveAll(td)
+	defer os.RemoveAll(td) //nolint:errcheck
 	fmt.Println("Using temporary directory:", td)
 	tdr, err := os.OpenRoot(td)
 	if err != nil {
 		panic(err)
 	}
-	defer tdr.Close()
+	defer tdr.Close() //nolint:errcheck
 
 	sigCh := make(chan os.Signal, 1)
 	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
@@ -63,7 +63,7 @@ func main() {
 	go func() {
 		sig := <-sigCh
 		fmt.Printf("Received %v, shutting down\n", sig)
-		s.Shutdown(context.TODO())
+		s.Shutdown(context.TODO()) //nolint:errcheck
 	}()
 
 	if err := s.ListenAndServe(); err != nil {
@@ -133,7 +133,7 @@ func (h *handler) getOrHead(res http.ResponseWriter, req *http.Request, p string
 		h.errToHTTP(req, res, err)
 		return
 	}
-	defer f.Close()
+	defer f.Close() //nolint:errcheck
 	st, err := f.Stat()
 	if err != nil {
 		h.err(http.StatusInternalServerError, req, err)
@@ -164,14 +164,20 @@ func (h *handler) put(res http.ResponseWriter, req *http.Request, p string) {
 		h.errToHTTP(req, res, err)
 		return
 	}
-	defer f.Close()
+	defer f.Close() //nolint:errcheck
 	if _, err := io.Copy(f, req.Body); err != nil {
 		h.err(http.StatusInternalServerError, req, err)
 		res.WriteHeader(http.StatusInternalServerError)
-		return
+	} else if err := f.Sync(); err != nil {
+		h.err(http.StatusInternalServerError, req, err)
+		res.WriteHeader(http.StatusInternalServerError)
+	} else if err := f.Close(); err != nil {
+		h.err(http.StatusInternalServerError, req, err)
+		res.WriteHeader(http.StatusInternalServerError)
+	} else {
+		res.WriteHeader(http.StatusNoContent)
+		h.ok(http.StatusNoContent, req)
 	}
-	res.WriteHeader(http.StatusNoContent)
-	h.ok(http.StatusNoContent, req)
 }
 
 func (h *handler) delete(res http.ResponseWriter, req *http.Request, p string) {

addons/gocache/rootfs.go

@@ -11,7 +11,7 @@ type rootFS struct {
 }
 
 func (r *rootFS) FullName(name string) string {
-	return filepath.Join(r.Root.Name(), name)
+	return filepath.Join(r.Name(), name)
 }
 
 // Open implements DiskDirFS.

magefiles/lint.go

@@ -3,7 +3,9 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"sync"
 
 	"github.com/magefile/mage/mg"
@@ -21,6 +23,28 @@ func LintDefault(ctx context.Context) error {
 type Lint mg.Namespace
 
 var findGCI = sync.OnceValue(func() string {
+	gb := os.Getenv("GOBIN")
+	if gb == "" {
+		gb = os.Getenv("GOPATH")
+		if gb == "" {
+			gb = os.Getenv("HOME") + "/go"
+		}
+		gb += "/bin"
+	}
+	gbInPath := false
+	pathVals := os.Getenv("PATH")
+	for _, dir := range filepath.SplitList(pathVals) {
+		if dir == gb {
+			gbInPath = true
+			break
+		}
+	}
+	if !gbInPath {
+		// add GOBIN to PATH so that we can find golangci-lint
+		pathVals += string(os.PathListSeparator) + gb
+		_ = os.Setenv("PATH", pathVals)
+	}
+
 	if p, err := exec.LookPath("golangci-lint-v2"); err == nil {
 		return p
 	}