Lint stuff for golangci-lint

mattwoberts · mattwoberts · commit a7fc4d8986c6 · 2025-12-17T20:00:28.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,7 +65,7 @@ jobs:
           cache: 'npm'
       - run: npm ci # required for esbuild
       - name: install golangci-lint
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.1
+        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.7.2
       - name: install godotenv
         run: go install github.com/joho/godotenv/cmd/godotenv
       - run: make lint-server
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -122,7 +122,7 @@ The application includes pluggable services for:
 3. **Docker** - PostgreSQL and local SMTP (MailHog)
 4. **Air** - Go hot reload: `go install github.com/cosmtrek/air`
 5. **Godotenv** - Environment loading: `go install github.com/joho/godotenv/cmd/godotenv`
-6. **golangci-lint** - Go linting: `go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1`
+6. **golangci-lint** - Go linting: `go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.7.2`
 
 **Environment Setup:**
 
diff --git a/app/cmd/ping.go b/app/cmd/ping.go
@@ -35,7 +35,7 @@ func RunPing() int {
 		return 1
 	}
 
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 	if resp.StatusCode >= 400 {
 		fmt.Printf("Request failed with status code: %d\n", resp.StatusCode)
 		return 1
diff --git a/app/cmd/signals_unix.go b/app/cmd/signals_unix.go
@@ -24,8 +24,8 @@ func handleExtraSignal(s os.Signal, e *web.Engine) int {
 		_ = pprof.Lookup("goroutine").WriteTo(buf, 1)
 		_ = pprof.Lookup("heap").WriteTo(buf, 1)
 		buf.WriteString("\n")
-		buf.WriteString(fmt.Sprintf("# Worker Queue: %d\n", e.Worker().Length()))
-		buf.WriteString(fmt.Sprintf("# Num Goroutines: %d\n", runtime.NumGoroutine()))
+		fmt.Fprintf(buf, "# Worker Queue: %d\n", e.Worker().Length())
+		fmt.Fprintf(buf, "# Num Goroutines: %d\n", runtime.NumGoroutine())
 		println(buf.String())
 	}
 	return -1
diff --git a/app/const.go b/app/const.go
@@ -3,7 +3,7 @@ package app
 import "errors"
 
 // ErrNotFound represents an object not found error
-var ErrNotFound = errors.New("Object not found")
+var ErrNotFound = errors.New("object not found")
 
 // InvitePlaceholder represents the placeholder used by members to invite other users
 var InvitePlaceholder = "%invite%"
diff --git a/app/handlers/apiv1/invite.go b/app/handlers/apiv1/invite.go
@@ -23,7 +23,7 @@ func SendSampleInvite() web.HandlerFunc {
 		}
 
 		if c.User().Email != "" {
-			action.Message = strings.Replace(action.Message, app.InvitePlaceholder, "*[the link to join will be here]*", -1)
+			action.Message = strings.ReplaceAll(action.Message, app.InvitePlaceholder, "*[the link to join will be here]*")
 			to := dto.NewRecipient(c.User().Name, c.User().Email, dto.Props{
 				"subject": action.Subject,
 				"message": markdown.Full(action.Message, true),
diff --git a/app/handlers/apiv1/post_test.go b/app/handlers/apiv1/post_test.go
@@ -214,9 +214,10 @@ func TestCreatePostHandler_WithPublicTagAndPrivateTagAsCollaborator(t *testing.T
 
 		tagAssignments := make([]*cmd.AssignTag, 2)
 		bus.AddHandler(func(ctx context.Context, c *cmd.AssignTag) error {
-			if c.Tag.Slug == "public_tag" {
+			switch c.Tag.Slug {
+			case "public_tag":
 				tagAssignments[0] = c
-			} else if c.Tag.Slug == "private_tag" {
+			case "private_tag":
 				tagAssignments[1] = c
 			}
 			return nil
diff --git a/app/handlers/notification_test.go b/app/handlers/notification_test.go
@@ -55,20 +55,22 @@ func TestReadNotificationHandler(t *testing.T) {
 	not2 := &entity.Notification{ID: 2, Link: "/def"}
 
 	bus.AddHandler(func(ctx context.Context, q *query.GetNotificationByID) error {
-		if q.ID == 1 {
+		switch q.ID {
+		case 1:
 			q.Result = not1
-		} else if q.ID == 2 {
+		case 2:
 			q.Result = not2
-		} else {
+		default:
 			q.Result = nil
 		}
 		return nil
 	})
 
 	bus.AddHandler(func(ctx context.Context, c *cmd.MarkNotificationAsRead) error {
-		if c.ID == 1 {
+		switch c.ID {
+		case 1:
 			not1.Read = true
-		} else if c.ID == 2 {
+		case 2:
 			not2.Read = true
 		}
 		return nil
diff --git a/app/jobs/job.go b/app/jobs/job.go
@@ -53,8 +53,8 @@ func (j fiderJob) Run() {
 
 		// Jobs should take at least 1sec before unlocking to avoid double execution
 		if elapsedMs <= 1000 {
-			waitMs := time.Duration(1000 - elapsedMs)
-			time.Sleep(waitMs * time.Millisecond)
+			wait := time.Duration(1000 - elapsedMs)
+			time.Sleep(wait * time.Millisecond)
 		}
 		unlock()
 	}
diff --git a/app/middlewares/compress.go b/app/middlewares/compress.go
@@ -34,7 +34,7 @@ func Compress() web.MiddlewareFunc {
 				}
 
 				err := next(c)
-				gw.Close()
+				_ = gw.Close()
 				return err
 			}
 			return next(c)
diff --git a/app/middlewares/tenant_test.go b/app/middlewares/tenant_test.go
@@ -42,10 +42,11 @@ func TestMultiTenant(t *testing.T) {
 	RegisterT(t)
 
 	bus.AddHandler(func(ctx context.Context, q *query.GetTenantByDomain) error {
-		if q.Domain == "avengers.test.fider.io" {
+		switch q.Domain {
+		case "avengers.test.fider.io":
 			q.Result = mock.AvengersTenant
 			return nil
-		} else if q.Domain == "demo.test.fider.io" {
+		case "demo.test.fider.io":
 			q.Result = mock.DemoTenant
 			return nil
 		}
@@ -139,10 +140,11 @@ func TestMultiTenant_CanonicalHeader(t *testing.T) {
 	RegisterT(t)
 
 	bus.AddHandler(func(ctx context.Context, q *query.GetTenantByDomain) error {
-		if q.Domain == "avengers.test.fider.io" {
+		switch q.Domain {
+		case "avengers.test.fider.io":
 			q.Result = mock.AvengersTenant
 			return nil
-		} else if q.Domain == "demo.test.fider.io" {
+		case "demo.test.fider.io":
 			q.Result = mock.DemoTenant
 			return nil
 		}
diff --git a/app/models/entity/user.go b/app/models/entity/user.go
@@ -58,6 +58,6 @@ func (umc UserWithEmail) MarshalJSON() ([]byte, error) {
 		Email string `json:"email"`
 	}{
 		Alias: (*Alias)(umc.User),
-		Email: umc.User.Email,
+		Email: umc.Email,
 	})
 }
diff --git a/app/pkg/assert/assert.go b/app/pkg/assert/assert.go
@@ -72,7 +72,7 @@ func copyEnv() {
 
 func restartEnv() {
 	for k, v := range envVariables {
-		os.Setenv(k, v)
+		_ = os.Setenv(k, v)
 	}
 	env.Reload()
 }
diff --git a/app/pkg/backup/export.go b/app/pkg/backup/export.go
@@ -29,7 +29,7 @@ func exportTable(ctx context.Context, tableName string) ([]byte, error) {
 }
 
 func jsonify(rows *sql.Rows) []map[string]any {
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	columns, err := rows.Columns()
 	if err != nil {
 		panic(err.Error())
diff --git a/app/pkg/bus/bus.go b/app/pkg/bus/bus.go
@@ -110,7 +110,7 @@ func Dispatch(ctx context.Context, msgs ...Msg) error {
 		key := getKey(msg)
 		handler := handlers[key]
 		if handler == nil {
-			panic(fmt.Errorf("could not find handler for '%s'.", key))
+			panic(fmt.Errorf("could not find handler for '%s'", key))
 		}
 
 		var params = []reflect.Value{
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
@@ -146,7 +146,7 @@ func (trx *Trx) Get(data any, command string, args ...any) error {
 		return wrap(err, "failed to execute trx.Get")
 	}
 
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	if rows.Next() {
 		columns, _ := rows.Columns()
 		err := rowMapper.Map(data, columns, rows.Scan)
@@ -178,7 +178,7 @@ func (trx *Trx) Exists(command string, args ...any) (bool, error) {
 		return false, wrap(err, "failed to execute trx.Exists")
 	}
 
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	return rows.Next(), nil
 }
 
@@ -201,7 +201,7 @@ func (trx *Trx) Count(command string, args ...any) (int, error) {
 		return 0, wrap(err, "failed to execute trx.Count")
 	}
 
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	count := 0
 	for rows.Next() {
 		count++
@@ -228,7 +228,7 @@ func (trx *Trx) Select(data any, command string, args ...any) error {
 		return wrap(err, "failed to execute trx.Select")
 	}
 
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	sliceType := reflect.TypeOf(data).Elem()
 	items := reflect.New(sliceType).Elem()
 	itemType := sliceType.Elem().Elem()
diff --git a/app/pkg/dbx/migrate.go b/app/pkg/dbx/migrate.go
@@ -16,7 +16,7 @@ import (
 )
 
 // ErrNoChanges means that the migration process didn't change execute any file
-var ErrNoChanges = stdErrors.New("nothing to migrate.")
+var ErrNoChanges = stdErrors.New("nothing to migrate")
 
 // Migrate the database to latest version
 func Migrate(ctx context.Context, path string) error {
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
@@ -187,23 +187,23 @@ func Reload() {
 		}
 	}
 
-	emailType := Config.Email.Type
-	if emailType == "mailgun" {
+	switch Config.Email.Type {
+	case "mailgun":
 		mustBeSet("EMAIL_MAILGUN_API")
 		mustBeSet("EMAIL_MAILGUN_DOMAIN")
-	} else if emailType == "awsses" {
+	case "awsses":
 		mustBeSet("EMAIL_AWSSES_REGION")
 		mustBeSet("EMAIL_AWSSES_ACCESS_KEY_ID")
 		mustBeSet("EMAIL_AWSSES_SECRET_ACCESS_KEY")
-	} else if emailType == "smtp" {
+	case "smtp":
 		mustBeSet("EMAIL_SMTP_HOST")
 		mustBeSet("EMAIL_SMTP_PORT")
 	}
 
-	bsType := Config.BlobStorage.Type
-	if bsType == "s3" {
+	switch Config.BlobStorage.Type {
+	case "s3":
 		mustBeSet("BLOB_STORAGE_S3_BUCKET")
-	} else if bsType == "fs" {
+	case "fs":
 		mustBeSet("BLOB_STORAGE_FS_PATH")
 	}
 }
@@ -293,14 +293,14 @@ func Subdomain(host string) string {
 
 	domain := MultiTenantDomain()
 	if domain != "" && strings.Contains(host, domain) {
-		return strings.Replace(host, domain, "", -1)
+		return strings.ReplaceAll(host, domain, "")
 	}
 
 	if Config.CDN.Host != "" {
 		domain = Config.CDN.Host
 		parts := strings.Split(domain, ":")
 		if parts[0] != "" && strings.Contains(host, "."+parts[0]) {
-			return strings.Replace(host, "."+parts[0], "", -1)
+			return strings.ReplaceAll(host, "."+parts[0], "")
 		}
 	}
 
diff --git a/app/pkg/jwt/jwt.go b/app/pkg/jwt/jwt.go
@@ -94,7 +94,7 @@ func DecodeOAuthStateClaims(token string) (*OAuthStateClaims, error) {
 func decode(token string, claims jwtgo.Claims) error {
 	jwtToken, err := jwtgo.ParseWithClaims(token, claims, func(t *jwtgo.Token) (any, error) {
 		if _, ok := t.Method.(*jwtgo.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("Unexpected signing method: %v", t.Header["alg"])
+			return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
 		}
 
 		return []byte(jwtSecret), nil
diff --git a/app/pkg/jwt/jwt_test.go b/app/pkg/jwt/jwt_test.go
@@ -53,7 +53,7 @@ func TestJWT_Decode_DifferentSignMethod(t *testing.T) {
 	Expect(err).IsNil()
 
 	decoded, err := jwt.DecodeFiderClaims(token)
-	Expect(err.Error()).ContainsSubstring("Unexpected signing method: none")
+	Expect(err.Error()).ContainsSubstring("unexpected signing method: none")
 	Expect(decoded).IsNil()
 }
 
diff --git a/app/pkg/web/binder.go b/app/pkg/web/binder.go
@@ -11,7 +11,7 @@ import (
 
 var (
 	//ErrContentTypeNotAllowed is used when POSTing a body that is not json
-	ErrContentTypeNotAllowed = stdErrors.New("Only Content-Type application/json is allowed")
+	ErrContentTypeNotAllowed = stdErrors.New("only Content-Type application/json is allowed")
 )
 
 //DefaultBinder is the default HTTP binder
@@ -109,9 +109,10 @@ func isString(k reflect.Kind) bool {
 
 func applyFormat(format string, value string) string {
 	value = strings.TrimSpace(value)
-	if format == "lower" {
+	switch format {
+	case "lower":
 		value = strings.ToLower(value)
-	} else if format == "upper" {
+	case "upper":
 		value = strings.ToUpper(value)
 	}
 	return value
diff --git a/app/pkg/web/engine_test.go b/app/pkg/web/engine_test.go
@@ -70,12 +70,12 @@ func TestEngine_StartRequestStop(t *testing.T) {
 	resp, err := http.Get("http://127.0.0.1:8080/hello")
 	Expect(err).IsNil()
 	Expect(resp.StatusCode).Equals(http.StatusOK)
-	resp.Body.Close()
+	_ = resp.Body.Close()
 
 	resp, err = http.Get("http://127.0.0.1:8080/world")
 	Expect(err).IsNil()
 	Expect(resp.StatusCode).Equals(http.StatusNotFound)
-	resp.Body.Close()
+	_ = resp.Body.Close()
 
 	StopServer()
 
@@ -91,15 +91,15 @@ func TestEngine_MiddlewareAfterHandler(t *testing.T) {
 	resp, err := http.Get("http://127.0.0.1:8080/api/ping")
 	Expect(err).IsNil()
 	Expect(resp.StatusCode).Equals(http.StatusOK)
-	resp.Body.Close()
+	_ = resp.Body.Close()
 
 	resp, err = http.Get("http://127.0.0.1:8080/api/echo?name=John")
 	Expect(err).IsNil()
 	Expect(resp.StatusCode).Equals(http.StatusOK)
 	content, err := io.ReadAll(resp.Body)
 	Expect(err).IsNil()
 	Expect(string(content)).Equals("John")
-	resp.Body.Close()
+	_ = resp.Body.Close()
 
 	StopServer()
 }
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
@@ -83,7 +83,7 @@ func (r *Renderer) loadAssets() error {
 	if err != nil {
 		return errors.Wrap(err, "failed to open file: assets.json")
 	}
-	defer jsonFile.Close()
+	defer func() { _ = jsonFile.Close() }()
 
 	jsonBytes, _ := io.ReadAll(jsonFile)
 	file := &assetsFile{}
@@ -159,7 +159,7 @@ func (r *Renderer) Render(w io.Writer, statusCode int, props Props, ctx *Context
 	public["title"] = title
 
 	if props.Description != "" {
-		description := strings.Replace(props.Description, "\n", " ", -1)
+		description := strings.ReplaceAll(props.Description, "\n", " ")
 		public["description"] = fmt.Sprintf("%.150s", description)
 	}
 
diff --git a/app/pkg/web/renderer_test.go b/app/pkg/web/renderer_test.go
@@ -24,7 +24,7 @@ func compareRendererResponse(buf *bytes.Buffer, fileName string, ctx *web.Contex
 	// os.WriteFile(env.Path(fileName), []byte(strings.Replace(buf.String(), ctx.ContextID(), "CONTEXT_ID", -1)), 0744)
 	bytes, err := os.ReadFile(env.Path(fileName))
 	Expect(err).IsNil()
-	Expect(strings.Replace(buf.String(), ctx.ContextID(), "CONTEXT_ID", -1)).Equals(string(bytes))
+	Expect(strings.ReplaceAll(buf.String(), ctx.ContextID(), "CONTEXT_ID")).Equals(string(bytes))
 }
 
 func TestRenderer_Basic(t *testing.T) {
diff --git a/app/services/blob/blob.go b/app/services/blob/blob.go
@@ -11,10 +11,10 @@ import (
 )
 
 // ErrNotFound is returned when given blob is not found
-var ErrNotFound = errors.New("Blob not found")
+var ErrNotFound = errors.New("blob not found")
 
 // ErrInvalidKeyFormat is returned when blob key is in invalid format
-var ErrInvalidKeyFormat = errors.New("Blob key is in invalid format")
+var ErrInvalidKeyFormat = errors.New("blob key is in invalid format")
 
 // SanitizeFileName replaces invalid characters from given filename
 func SanitizeFileName(fileName string) string {
@@ -50,6 +50,6 @@ func EnsureAuthorizedPrefix(ctx context.Context, path string) {
 
 	// 'tenants' prefix is not valid when running outside a tenant context
 	if strings.HasPrefix(path, "tenants") {
-		panic(errors.New("Unauthorized access to 'tenants' path."))
+		panic(errors.New("unauthorized access to 'tenants' path"))
 	}
 }
diff --git a/app/services/blob/s3/s3.go b/app/services/blob/s3/s3.go
diff --git a/app/services/email/message.go b/app/services/email/message.go
diff --git a/app/services/email/smtp/smtp.go b/app/services/email/smtp/smtp.go
diff --git a/app/services/httpclient/httpclient.go b/app/services/httpclient/httpclient.go
diff --git a/app/services/oauth/oauth.go b/app/services/oauth/oauth.go
diff --git a/app/services/sqlstore/postgres/common.go b/app/services/sqlstore/postgres/common.go
diff --git a/app/tasks/invites.go b/app/tasks/invites.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/tools.go b/tools.go

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func RunPing() int {`
`35`	`35`	`return 1`
`36`	`36`	`}`
`37`	`37`
`38`		`- defer resp.Body.Close()`
	`38`	`+ defer func() { _ = resp.Body.Close() }()`
`39`	`39`	`if resp.StatusCode >= 400 {`
`40`	`40`	`fmt.Printf("Request failed with status code: %d\n", resp.StatusCode)`
`41`	`41`	`return 1`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func SendSampleInvite() web.HandlerFunc {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if c.User().Email != "" {`
`26`		`- action.Message = strings.Replace(action.Message, app.InvitePlaceholder, "[the link to join will be here]", -1)`
	`26`	`+ action.Message = strings.ReplaceAll(action.Message, app.InvitePlaceholder, "[the link to join will be here]")`
`27`	`27`	`to := dto.NewRecipient(c.User().Name, c.User().Email, dto.Props{`
`28`	`28`	`"subject": action.Subject,`
`29`	`29`	`"message": markdown.Full(action.Message, true),`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ func (j fiderJob) Run() {`
`53`	`53`
`54`	`54`	`// Jobs should take at least 1sec before unlocking to avoid double execution`
`55`	`55`	`if elapsedMs <= 1000 {`
`56`		`- waitMs := time.Duration(1000 - elapsedMs)`
`57`		`- time.Sleep(waitMs * time.Millisecond)`
	`56`	`+ wait := time.Duration(1000 - elapsedMs)`
	`57`	`+ time.Sleep(wait * time.Millisecond)`
`58`	`58`	`}`
`59`	`59`	`unlock()`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func Compress() web.MiddlewareFunc {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`err := next(c)`
`37`		`- gw.Close()`
	`37`	`+ _ = gw.Close()`
`38`	`38`	`return err`
`39`	`39`	`}`
`40`	`40`	`return next(c)`