Update golangci-lint to v2.6.0

silverwind · silverwind · commit 0e7dc9e43663 · 2025-10-31T09:43:32.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -14,9 +14,9 @@ linters:
     - govet
     - ineffassign
     - mirror
+    - modernize
     - nakedret
     - nolintlint
-    - perfsprint
     - revive
     - staticcheck
     - testifylint
@@ -55,6 +55,7 @@ linters:
       disabled-checks:
         - ifElseChain
         - singleCaseSwitch # Every time this occurred in the code, there was no other way.
+        - deprecatedComment # conflicts with go-swagger comments
     revive:
       severity: error
       rules:
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ XGO_VERSION := go-1.25.x
 AIR_PACKAGE ?= github.com/air-verse/air@v1
 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
 GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.9.2
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.0
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.15
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.7.0
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.33.1
diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go
@@ -66,6 +66,7 @@ func parseKeyString(content string) (string, error) {
 		lines := strings.Split(content, "\n")
 		continuationLine := false
 
+		var keyContentSb69 strings.Builder
 		for _, line := range lines {
 			// Skip lines that:
 			// 1) are a continuation of the previous line,
@@ -74,9 +75,10 @@ func parseKeyString(content string) (string, error) {
 			if continuationLine || strings.ContainsAny(line, ":-") {
 				continuationLine = strings.HasSuffix(line, "\\")
 			} else {
-				keyContent += line
+				keyContentSb69.WriteString(line)
 			}
 		}
+		keyContent += keyContentSb69.String()
 
 		t, err := extractTypeFromBase64Key(keyContent)
 		if err != nil {
diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"strings"
 
 	actions_model "code.gitea.io/gitea/models/actions"
 	"code.gitea.io/gitea/models/db"
@@ -171,6 +172,7 @@ func (p *Permission) LogString() string {
 	format := "<Permission AccessMode=%s, %d Units, %d UnitsMode(s): ["
 	args := []any{p.AccessMode.ToString(), len(p.units), len(p.unitsMode)}
 
+	var formatSb174 strings.Builder
 	for i, u := range p.units {
 		config := ""
 		if u.Config != nil {
@@ -180,13 +182,16 @@ func (p *Permission) LogString() string {
 				config = err.Error()
 			}
 		}
-		format += "\n\tunits[%d]: ID=%d RepoID=%d Type=%s Config=%s"
+		formatSb174.WriteString("\n\tunits[%d]: ID=%d RepoID=%d Type=%s Config=%s")
 		args = append(args, i, u.ID, u.RepoID, u.Type.LogString(), config)
 	}
+	format += formatSb174.String()
+	var formatSb186 strings.Builder
 	for key, value := range p.unitsMode {
-		format += "\n\tunitsMode[%-v]: %-v"
+		formatSb186.WriteString("\n\tunitsMode[%-v]: %-v")
 		args = append(args, key.LogString(), value.LogString())
 	}
+	format += formatSb186.String()
 	format += "\n\tanonymousAccessMode: %-v"
 	args = append(args, p.anonymousAccessMode)
 	format += "\n\teveryoneAccessMode: %-v"
diff --git a/models/user/user.go b/models/user/user.go
@@ -1262,8 +1262,8 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {
 	}
 
 	// Finally, if email address is the protected email address:
-	if strings.HasSuffix(email, "@"+setting.Service.NoReplyAddress) {
-		username := strings.TrimSuffix(email, "@"+setting.Service.NoReplyAddress)
+	if before, ok := strings.CutSuffix(email, "@"+setting.Service.NoReplyAddress); ok {
+		username := before
 		user := &User{}
 		has, err := db.GetEngine(ctx).Where("lower_name=?", username).Get(user)
 		if err != nil {
diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go
@@ -62,18 +62,22 @@ func NewComplexity() {
 
 func setupComplexity(values []string) {
 	if len(values) != 1 || values[0] != "off" {
+		var validCharsSb65 strings.Builder
 		for _, val := range values {
 			if complexity, ok := charComplexities[val]; ok {
-				validChars += complexity.ValidChars
+				validCharsSb65.WriteString(complexity.ValidChars)
 				requiredList = append(requiredList, complexity)
 			}
 		}
+		validChars += validCharsSb65.String()
 		if len(requiredList) == 0 {
 			// No valid character classes found; use all classes as default
+			var validCharsSb73 strings.Builder
 			for _, complexity := range charComplexities {
-				validChars += complexity.ValidChars
+				validCharsSb73.WriteString(complexity.ValidChars)
 				requiredList = append(requiredList, complexity)
 			}
+			validChars += validCharsSb73.String()
 		}
 	}
 	if validChars == "" {
diff --git a/modules/git/foreachref/format.go b/modules/git/foreachref/format.go
@@ -76,8 +76,10 @@ func (f Format) Parser(r io.Reader) *Parser {
 // would turn into "%0a%00".
 func (f Format) hexEscaped(delim []byte) string {
 	escaped := ""
+	var escapedSb79 strings.Builder
 	for i := range delim {
-		escaped += "%" + hex.EncodeToString([]byte{delim[i]})
+		escapedSb79.WriteString("%" + hex.EncodeToString([]byte{delim[i]}))
 	}
+	escaped += escapedSb79.String()
 	return escaped
 }
diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go
@@ -33,15 +33,16 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
 
 	var entry *TreeEntry
 	originalCommitID := commitID
+	var pathSb36 strings.Builder
 	for len(commitID) > 2 {
 		entry, err = tree.GetTreeEntryByPath(commitID)
 		if err == nil {
-			path += commitID
+			pathSb36.WriteString(commitID)
 			break
 		}
 		if IsErrNotExist(err) {
 			tree, err = tree.SubTree(commitID[0:2])
-			path += commitID[0:2] + "/"
+			pathSb36.WriteString(commitID[0:2] + "/")
 			commitID = commitID[2:]
 		}
 		if err != nil {
@@ -52,6 +53,7 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
 			return err
 		}
 	}
+	path += pathSb36.String()
 
 	blob := entry.Blob()
 	dataRc, err := blob.DataAsync()
diff --git a/modules/setting/config.go b/modules/setting/config.go
@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"strings"
 	"sync"
 
 	"code.gitea.io/gitea/modules/log"
@@ -24,9 +25,11 @@ type OpenWithEditorAppsType []OpenWithEditorApp
 
 func (t OpenWithEditorAppsType) ToTextareaString() string {
 	ret := ""
+	var retSb27 strings.Builder
 	for _, app := range t {
-		ret += app.DisplayName + " = " + app.OpenURL + "\n"
+		retSb27.WriteString(app.DisplayName + " = " + app.OpenURL + "\n")
 	}
+	ret += retSb27.String()
 	return ret
 }
 
diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go
@@ -48,18 +48,20 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 	inKey := false
 	last := 0
 	escapeStringIndices := escapeRegex.FindAllStringIndex(encoded, -1)
+	var keySb51 strings.Builder
+	var sectionSb51 strings.Builder
 	for _, unescapeIdx := range escapeStringIndices {
 		preceding := encoded[last:unescapeIdx[0]]
 		if !inKey {
 			if splitter := strings.Index(preceding, "__"); splitter > -1 {
-				section += preceding[:splitter]
+				sectionSb51.WriteString(preceding[:splitter])
 				inKey = true
-				key += preceding[splitter+2:]
+				keySb51.WriteString(preceding[splitter+2:])
 			} else {
-				section += preceding
+				sectionSb51.WriteString(preceding)
 			}
 		} else {
-			key += preceding
+			keySb51.WriteString(preceding)
 		}
 		toDecode := encoded[unescapeIdx[0]+3 : unescapeIdx[1]-1]
 		decodedBytes := make([]byte, len(toDecode)/2)
@@ -69,12 +71,14 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 			decodedBytes[i] = byte(byteInt)
 		}
 		if inKey {
-			key += string(decodedBytes)
+			keySb51.Write(decodedBytes)
 		} else {
-			section += string(decodedBytes)
+			sectionSb51.Write(decodedBytes)
 		}
 		last = unescapeIdx[1]
 	}
+	key += keySb51.String()
+	section += sectionSb51.String()
 	remaining := encoded[last:]
 	if !inKey {
 		if splitter := strings.Index(remaining, "__"); splitter > -1 {
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
@@ -250,14 +250,16 @@ func (ut *RenderUtils) RenderLabels(labels []*issues_model.Label, repoLink strin
 	isPullRequest := issue != nil && issue.IsPull
 	baseLink := fmt.Sprintf("%s/%s", repoLink, util.Iif(isPullRequest, "pulls", "issues"))
 	htmlCode := `<span class="labels-list">`
+	var htmlCodeSb253 strings.Builder
 	for _, label := range labels {
 		// Protect against nil value in labels - shouldn't happen but would cause a panic if so
 		if label == nil {
 			continue
 		}
 		link := fmt.Sprintf("%s?labels=%d", baseLink, label.ID)
-		htmlCode += string(ut.RenderLabelWithLink(label, template.URL(link)))
+		htmlCodeSb253.WriteString(string(ut.RenderLabelWithLink(label, template.URL(link))))
 	}
+	htmlCode += htmlCodeSb253.String()
 	htmlCode += "</span>"
 	return template.HTML(htmlCode)
 }
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
@@ -96,13 +96,15 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 	}
 
 	var timeStr, diffStr string
+	var timeStrSb99 strings.Builder
 	for {
 		if diff == 0 {
 			break
 		}
 
 		diff, diffStr = computeTimeDiffFloor(diff, lang)
-		timeStr += ", " + diffStr
+		timeStrSb99.WriteString(", " + diffStr)
 	}
+	timeStr += timeStrSb99.String()
 	return strings.TrimPrefix(timeStr, ", ")
 }
diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go
@@ -434,13 +434,15 @@ func makePackageVersionDependency(ctx *context.Context, version *packages_model.
 
 func makePackageInfo(ctx *context.Context, versions []*packages_model.PackageVersion, c *cache.EphemeralCache) (string, error) {
 	ret := "---\n"
+	var retSb437 strings.Builder
 	for _, v := range versions {
 		dep, err := makePackageVersionDependency(ctx, v, c)
 		if err != nil {
 			return "", err
 		}
-		ret += dep + "\n"
+		retSb437.WriteString(dep + "\n")
 	}
+	ret += retSb437.String()
 	return ret, nil
 }
 
diff --git a/routers/web/auth/oauth2_provider.go b/routers/web/auth/oauth2_provider.go
@@ -180,9 +180,11 @@ func AuthorizeOAuth(ctx *context.Context) {
 	errs = form.Validate(ctx.Req, errs)
 	if len(errs) > 0 {
 		errstring := ""
+		var errstringSb183 strings.Builder
 		for _, e := range errs {
-			errstring += e.Error() + "\n"
+			errstringSb183.WriteString(e.Error() + "\n")
 		}
+		errstring += errstringSb183.String()
 		ctx.ServerError("AuthorizeOAuth: Validate: ", fmt.Errorf("errors occurred during validation: %s", errstring))
 		return
 	}
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
@@ -7,6 +7,7 @@ package setting
 import (
 	"errors"
 	"net/http"
+	"strings"
 
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
@@ -132,10 +133,12 @@ func KeysPost(ctx *context.Context) {
 			return
 		}
 		keyIDs := ""
+		var keyIDsSb135 strings.Builder
 		for _, key := range keys {
-			keyIDs += key.KeyID
-			keyIDs += ", "
+			keyIDsSb135.WriteString(key.KeyID)
+			keyIDsSb135.WriteString(", ")
 		}
+		keyIDs += keyIDsSb135.String()
 		if len(keyIDs) > 0 {
 			keyIDs = keyIDs[:len(keyIDs)-2]
 		}
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -1141,13 +1141,15 @@ func readFileName(rd *strings.Reader) (string, bool) {
 		_, _ = fmt.Fscanf(rd, "%s ", &name)
 		char, _ := rd.ReadByte()
 		_ = rd.UnreadByte()
+		var nameSb1144 strings.Builder
 		for !(char == 0 || char == '"' || char == 'b') {
 			var suffix string
 			_, _ = fmt.Fscanf(rd, "%s ", &suffix)
-			name += " " + suffix
+			nameSb1144.WriteString(" " + suffix)
 			char, _ = rd.ReadByte()
 			_ = rd.UnreadByte()
 		}
+		name += nameSb1144.String()
 	}
 	if len(name) < 2 {
 		log.Error("Unable to determine name from reader: reader=%+v", rd)
diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go
@@ -74,18 +74,20 @@ func (dc dingtalkConvertor) Push(p *api.PushPayload) (DingtalkPayload, error) {
 
 	var text string
 	// for each commit, generate attachment text
+	var textSb77 strings.Builder
 	for i, commit := range p.Commits {
 		var authorName string
 		if commit.Author != nil {
 			authorName = " - " + commit.Author.Name
 		}
-		text += fmt.Sprintf("[%s](%s) %s", commit.ID[:7], commit.URL,
-			strings.TrimRight(commit.Message, "\r\n")) + authorName
+		textSb77.WriteString(fmt.Sprintf("[%s](%s) %s", commit.ID[:7], commit.URL,
+			strings.TrimRight(commit.Message, "\r\n")) + authorName)
 		// add linebreak to each commit but the last
 		if i < len(p.Commits)-1 {
-			text += "\r\n"
+			textSb77.WriteString("\r\n")
 		}
 	}
+	text += textSb77.String()
 
 	return createDingtalkPayload(title, text, linkText, titleLink), nil
 }
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
@@ -161,6 +161,7 @@ func (d discordConvertor) Push(p *api.PushPayload) (DiscordPayload, error) {
 
 	var text string
 	// for each commit, generate attachment text
+	var textSb164 strings.Builder
 	for i, commit := range p.Commits {
 		// limit the commit message display to just the summary, otherwise it would be hard to read
 		message := strings.TrimRight(strings.SplitN(commit.Message, "\n", 2)[0], "\r")
@@ -169,12 +170,13 @@ func (d discordConvertor) Push(p *api.PushPayload) (DiscordPayload, error) {
 		if utf8.RuneCountInString(message) > 50 {
 			message = fmt.Sprintf("%.47s...", message)
 		}
-		text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, message, commit.Author.Name)
+		textSb164.WriteString(fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, message, commit.Author.Name))
 		// add linebreak to each commit but the last
 		if i < len(p.Commits)-1 {
-			text += "\n"
+			textSb164.WriteString("\n")
 		}
 	}
+	text += textSb164.String()
 
 	return d.createPayload(p.Sender, title, text, titleLink, greenColor), nil
 }
diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go
@@ -78,18 +78,20 @@ func (fc feishuConvertor) Push(p *api.PushPayload) (FeishuPayload, error) {
 
 	text := fmt.Sprintf("[%s:%s] %s\r\n", p.Repo.FullName, branchName, commitDesc)
 	// for each commit, generate attachment text
+	var textSb81 strings.Builder
 	for i, commit := range p.Commits {
 		var authorName string
 		if commit.Author != nil {
 			authorName = " - " + commit.Author.Name
 		}
-		text += fmt.Sprintf("[%s](%s) %s", commit.ID[:7], commit.URL,
-			strings.TrimRight(commit.Message, "\r\n")) + authorName
+		textSb81.WriteString(fmt.Sprintf("[%s](%s) %s", commit.ID[:7], commit.URL,
+			strings.TrimRight(commit.Message, "\r\n")) + authorName)
 		// add linebreak to each commit but the last
 		if i < len(p.Commits)-1 {
-			text += "\r\n"
+			textSb81.WriteString("\r\n")
 		}
 	}
+	text += textSb81.String()
 
 	return newFeishuTextPayload(text), nil
 }
diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go
diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go
diff --git a/services/webhook/slack.go b/services/webhook/slack.go
diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go
diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go
diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go

-Original file line number
+Diff line change
 AIR_PACKAGE ?= github.com/air-verse/air@v1
 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
 GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
 -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0
 +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.0
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
Original file line number	Diff line number	Diff line change
`@@ -62,18 +62,22 @@ func NewComplexity() {`
`62`	`62`
`63`	`63`	`func setupComplexity(values []string) {`
`64`	`64`	`if len(values) != 1 \|\| values[0] != "off" {`
	`65`	`+ var validCharsSb65 strings.Builder`
`65`	`66`	`for _, val := range values {`
`66`	`67`	`if complexity, ok := charComplexities[val]; ok {`
`67`		`- validChars += complexity.ValidChars`
	`68`	`+ validCharsSb65.WriteString(complexity.ValidChars)`
`68`	`69`	`requiredList = append(requiredList, complexity)`
`69`	`70`	`}`
`70`	`71`	`}`
	`72`	`+ validChars += validCharsSb65.String()`
`71`	`73`	`if len(requiredList) == 0 {`
`72`	`74`	`// No valid character classes found; use all classes as default`
	`75`	`+ var validCharsSb73 strings.Builder`
`73`	`76`	`for _, complexity := range charComplexities {`
`74`		`- validChars += complexity.ValidChars`
	`77`	`+ validCharsSb73.WriteString(complexity.ValidChars)`
`75`	`78`	`requiredList = append(requiredList, complexity)`
`76`	`79`	`}`
	`80`	`+ validChars += validCharsSb73.String()`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`	`if validChars == "" {`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,10 @@ func (f Format) Parser(r io.Reader) *Parser {`
`76`	`76`	`// would turn into "%0a%00".`
`77`	`77`	`func (f Format) hexEscaped(delim []byte) string {`
`78`	`78`	`escaped := ""`
	`79`	`+ var escapedSb79 strings.Builder`
`79`	`80`	`for i := range delim {`
`80`		`- escaped += "%" + hex.EncodeToString([]byte{delim[i]})`
	`81`	`+ escapedSb79.WriteString("%" + hex.EncodeToString([]byte{delim[i]}))`
`81`	`82`	`}`
	`83`	`+ escaped += escapedSb79.String()`
`82`	`84`	`return escaped`
`83`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,16 @@ func GetNote(ctx context.Context, repo Repository, commitID string, note Note)`
`33`	`33`
`34`	`34`	`var entry *TreeEntry`
`35`	`35`	`originalCommitID := commitID`
	`36`	`+ var pathSb36 strings.Builder`
`36`	`37`	`for len(commitID) > 2 {`
`37`	`38`	`entry, err = tree.GetTreeEntryByPath(commitID)`
`38`	`39`	`if err == nil {`
`39`		`- path += commitID`
	`40`	`+ pathSb36.WriteString(commitID)`
`40`	`41`	`break`
`41`	`42`	`}`
`42`	`43`	`if IsErrNotExist(err) {`
`43`	`44`	`tree, err = tree.SubTree(commitID[0:2])`
`44`		`- path += commitID[0:2] + "/"`
	`45`	`+ pathSb36.WriteString(commitID[0:2] + "/")`
`45`	`46`	`commitID = commitID[2:]`
`46`	`47`	`}`
`47`	`48`	`if err != nil {`
`@@ -52,6 +53,7 @@ func GetNote(ctx context.Context, repo Repository, commitID string, note Note)`
`52`	`53`	`return err`
`53`	`54`	`}`
`54`	`55`	`}`
	`56`	`+ path += pathSb36.String()`
`55`	`57`
`56`	`58`	`blob := entry.Blob()`
`57`	`59`	`dataRc, err := blob.DataAsync()`