chore(lint): update to golangci-lint v2.6.0 (#7645)

Update to the latest golangci-lint version and use built-in modernize
linter, instead of a custom CI step.

Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>
This commit is contained in:
Ville Vesilehto
2025-10-30 14:07:16 +02:00
committed by GitHub
parent 60e2d455f9
commit 5cf4c80ac0
4 changed files with 11 additions and 9 deletions

View File

@@ -81,8 +81,8 @@ func newSuffixStringRewriter(orig, replacement string) stringRewriter {
}
func (r *suffixStringRewriter) rewriteString(src string) string {
if strings.HasSuffix(src, r.suffix) {
return strings.TrimSuffix(src, r.suffix) + r.replacement
if before, ok := strings.CutSuffix(src, r.suffix); ok {
return before + r.replacement
}
return src
}
@@ -234,8 +234,8 @@ func newSuffixNameRule(nextAction string, auto bool, suffix, replacement string,
}
func (rule *suffixNameRule) Rewrite(ctx context.Context, state request.Request) (ResponseRules, Result) {
if strings.HasSuffix(state.Name(), rule.suffix) {
state.Req.Question[0].Name = strings.TrimSuffix(state.Name(), rule.suffix) + rule.replacement
if before, ok := strings.CutSuffix(state.Name(), rule.suffix); ok {
state.Req.Question[0].Name = before + rule.replacement
return rule.responseRuleFor(state)
}
return nil, RewriteIgnored