build: Add initial golangci-lint configuration

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+*.go text eol=lf
+go.mod text eol=lf
+go.sum text eol=lf

.github/workflows/build.yml

@@ -31,3 +31,6 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - run: make build
+
+      - name: Validate
+        run: make validate

.golangci.yaml

@@ -0,0 +1,41 @@
+version: "2"
+run:
+  concurrency: 3
+linters:
+  default: all
+  disable:
+    - depguard
+    - gochecknoglobals
+    - exhaustruct
+    - err113
+    - gochecknoinits
+    - ireturn
+    - forbidigo
+    - mnd
+    - varnamelen
+    - godoclint
+    - noctx
+    - noinlineerr
+    - nestif
+    - gosec
+    - funlen
+    - cyclop
+    - gocritic
+    - revive
+    - wrapcheck
+    - wsl
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax

Makefile

@@ -1,3 +1,26 @@
+# renovate: datasource=github-tags depName=golangci/golangci-lint
+GOLANGCI_VERSION ?= v2.6.1
+TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools)
+
+GOLANGCI = $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+$(GOLANGCI):
+	rm -f $(TOOLS_BIN)/golangci-lint*
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/$(GOLANGCI_VERSION)/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_VERSION)
+	mv $(TOOLS_BIN)/golangci-lint $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+
 .PHONY: build
 build:
 	go build -o build/ ./...
+
+validate: validate-lint validate-dirty
+
+validate-lint: $(GOLANGCI)
+	$(GOLANGCI) run
+
+validate-dirty:
+ifneq ($(shell git status --porcelain --untracked-files=no),)
+	@echo worktree is dirty
+	@git --no-pager status
+	@git --no-pager diff
+	@exit 1
+endif

cmd/gogit-http-server/logging.go

@@ -9,17 +9,19 @@ import (
 
 type logWriter struct {
 	http.ResponseWriter
+
 	code, bytes int
 }
 
 func (r *logWriter) Write(p []byte) (int, error) {
 	written, err := r.ResponseWriter.Write(p)
 	r.bytes += written
+
 	return written, err
 }
 
 // Note this is generally only called when sending an HTTP error, so it's
-// important to set the `code` value to 200 as a default
+// important to set the `code` value to 200 as a default.
 func (r *logWriter) WriteHeader(code int) {
 	r.code = code
 	r.ResponseWriter.WriteHeader(code)

cmd/gogit-http-server/main.go

@@ -45,12 +45,14 @@ var rootCmd = &cobra.Command{
 		if err := http.ListenAndServe(addr, handler); !errors.Is(err, http.ErrServerClosed) {
 			return err
 		}
+
 		return nil
 	},
 }
 
 func main() {
-	if err := rootCmd.Execute(); err != nil {
+	err := rootCmd.Execute()
+	if err != nil {
 		log.Fatal(err)
 	}
 }

cmd/gogit/clone.go

@@ -60,9 +60,10 @@ var cloneCmd = &cobra.Command{
 			opts.Progress = cmd.OutOrStdout()
 		}
 
-		fmt.Fprintf(cmd.ErrOrStderr(), "Cloning into '%s'...\n", dir) //nolint:errcheck
+		fmt.Fprintf(cmd.ErrOrStderr(), "Cloning into '%s'...\n", dir)
 
 		_, err = git.PlainClone(dir, &opts)
+
 		return err
 	},
 	DisableFlagsInUseLine: true,

cmd/gogit/daemon.go

@@ -48,6 +48,7 @@ var daemonCmd = &cobra.Command{
 		}
 
 		log.Printf("Starting Git daemon on %q", addr)
+
 		return srv.ListenAndServe()
 	},
 }
@@ -62,17 +63,20 @@ var _ transport.Loader = (*dirsLoader)(nil)
 
 // NewDirsLoader creates a new dirsLoader with the given directories.
 func NewDirsLoader(dirs []string, strict, exportAll bool) *dirsLoader {
-	var loaders []transport.Loader
-	var fss []billy.Filesystem
+	loaders := make([]transport.Loader, 0, len(dirs))
+	fss := make([]billy.Filesystem, 0, len(dirs))
+
 	for _, dir := range dirs {
 		abs, err := filepath.Abs(dir)
 		if err != nil {
 			continue
 		}
+
 		fs := osfs.New(abs, osfs.WithBoundOS())
 		fss = append(fss, fs)
 		loaders = append(loaders, transport.NewFilesystemLoader(fs, strict))
 	}
+
 	return &dirsLoader{loaders: loaders, fss: fss, exportAll: exportAll}
 }
 
@@ -87,16 +91,18 @@ func (d *dirsLoader) Load(ep *transport.Endpoint) (storage.Storer, error) {
 				// repository.
 				dfs := d.fss[i]
 				okFile := filepath.Join(ep.Path, "git-daemon-export-ok")
+
 				stat, err := dfs.Lstat(okFile)
 				if err != nil || (stat != nil && !stat.Mode().IsRegular()) {
 					// If the file does not exist or is a directory,
 					// we skip this repository.
 					continue
 				}
-
 			}
+
 			return storer, nil
 		}
 	}
+
 	return nil, transport.ErrRepositoryNotFound
 }

cmd/gogit/fetch.go

@@ -27,7 +27,7 @@ func init() {
 var fetchCmd = &cobra.Command{
 	Use:   "fetch [<options>] [--] [<repository> [<refspec>...]]",
 	Short: "Download objects and refs from another repository",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		r, err := git.PlainOpen(".")
 		if err != nil {
 			return err

cmd/gogit/main.go

@@ -34,22 +34,26 @@ var envToTarget = map[string]trace.Target{
 func init() {
 	// Set up tracing
 	var target trace.Target
+
 	for k, v := range envToTarget {
 		if ok, _ := strconv.ParseBool(os.Getenv(k)); ok {
 			target |= v
 		}
 	}
+
 	trace.SetTarget(target)
 }
 
 func main() {
-	if err := rootCmd.Execute(); err != nil {
+	err := rootCmd.Execute()
+	if err != nil {
 		var rerr *transport.RemoteError
 		if errors.As(err, &rerr) {
 			fmt.Fprintln(os.Stderr, rerr)
 		} else {
 			fmt.Fprintln(os.Stderr, err)
 		}
+
 		os.Exit(1)
 	}
 }

cmd/gogit/pull.go

@@ -50,6 +50,7 @@ var pullCmd = &cobra.Command{
 		switch {
 		case errors.Is(err, git.NoErrAlreadyUpToDate):
 			cmd.Println("Already up-to-date.")
+
 			return nil
 		default:
 			return err

cmd/gogit/push.go

@@ -51,6 +51,7 @@ var pushCmd = &cobra.Command{
 				if args[0] == remote {
 					remoteName = remote
 					isRemote = true
+
 					break
 				}
 			}
@@ -114,6 +115,7 @@ var pushCmd = &cobra.Command{
 		err = remote.Push(&opts)
 		if errors.Is(err, git.NoErrAlreadyUpToDate) {
 			cmd.PrintErr("Everything up-to-date")
+
 			return nil
 		}
 

cmd/gogit/update-server-info.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"errors"
+
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/transport"
 	"github.com/go-git/go-git/v6/storage/filesystem"
@@ -14,13 +16,17 @@ func init() {
 var updateServerInfoCmd = &cobra.Command{
 	Use:   "update-server-info",
 	Short: "Update the server info file",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		r, err := git.PlainOpen(".")
 		if err != nil {
 			return err
 		}
 
-		fs := r.Storer.(*filesystem.Storage).Filesystem()
-		return transport.UpdateServerInfo(r.Storer, fs)
+		store, ok := r.Storer.(*filesystem.Storage)
+		if !ok {
+			return errors.New("storer does not implement filesystem.Storage")
+		}
+
+		return transport.UpdateServerInfo(r.Storer, store.Filesystem())
 	},
 }