Fix issues from golangci-lint

Author: linuxdaemon

cmd/healthcheck.go

@@ -16,10 +16,10 @@ func newHealthcheckCmd(cfg *config.Config) *ff.Command {
 		Name:      "healthcheck",
 		Usage:     "healthcheck [flags]",
 		ShortHelp: "Check if the server is running",
-		Exec: func(ctx context.Context, args []string) error {
+		Exec: func(ctx context.Context, _ []string) error {
 			// Create a new client
 			client := &http.Client{
-				Timeout: 5 * time.Second, //nolint:gomnd // We want to use a constant
+				Timeout: 5 * time.Second, //nolint:mnd // We want to use a constant
 			}
 
 			// Create a new request

cmd/serve.go

@@ -19,7 +19,7 @@ func newServerCmd(cfg *config.Config) *ff.Command {
 		Name:      "serve",
 		Usage:     "serve [flags]",
 		ShortHelp: "Start the webfinger server",
-		Exec: func(ctx context.Context, args []string) error {
+		Exec: func(ctx context.Context, _ []string) error {
 			// Create a logger and add it to the context
 			l := log.NewLogger(os.Stderr, cfg)
 			ctx = log.WithLogger(ctx, l)

internal/middleware/log_test.go

@@ -30,7 +30,7 @@ func TestRequestLogger(t *testing.T) {
 		t.Error("logger logged before request")
 	}
 
-	middleware.RequestLogger(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	middleware.RequestLogger(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusOK)
 	})).ServeHTTP(w, r)
 

internal/middleware/recover_test.go

@@ -38,7 +38,7 @@ func TestRecoverer(t *testing.T) {
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/", http.NoBody)
 
-		h := middleware.Recoverer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		h := middleware.Recoverer(http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) {
 			panic("test")
 		}))
 
@@ -61,7 +61,7 @@ func TestRecoverer(t *testing.T) {
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/", http.NoBody)
 
-		h := middleware.Recoverer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		h := middleware.Recoverer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		}))
 

internal/server/healthcheck.go

@@ -7,7 +7,7 @@ import (
 )
 
 func HealthCheckHandler(_ *config.Config) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusOK)
 	})
 }

internal/server/server.go

@@ -68,7 +68,7 @@ func StartServer(ctx context.Context, cfg *config.Config, fingers webfingers.Web
 			return egCtx
 		}
 
-		return srv.ListenAndServe() //nolint:wrapcheck // We wrap the error in the errgroup
+		return srv.ListenAndServe()
 	})
 	// Gracefully shutdown the server when the context is done
 	eg.Go(func() error {
@@ -80,7 +80,7 @@ func StartServer(ctx context.Context, cfg *config.Config, fingers webfingers.Web
 		// the server to shutdown if the context is canceled.
 		noCancelCtx := context.WithoutCancel(egCtx)
 
-		return srv.Shutdown(noCancelCtx) //nolint:wrapcheck // We wrap the error in the errgroup
+		return srv.Shutdown(noCancelCtx)
 	})
 
 	// Log when the server is fully shutdown