Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-06 02:15:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: Upgrade to golangci-lint v2 (#7236)

Browse Source 
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
This commit is contained in:
Manuel Rüger
2025-04-04 20:27:39 +02:00
committed by GitHub
parent e16162dd3c
commit 76ba39ffe9
50 changed files with 240 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/rewrite/cname_target.go
View File

@@ -49,7 +49,7 @@ func (r *cnameTargetRule) getFromAndToTarget(inputCName string) (from string, to
}
case SubstringMatch:
if strings.Contains(inputCName, r.paramFromTarget) {
return inputCName, strings.Replace(inputCName, r.paramFromTarget, r.paramToTarget, -1)
return inputCName, strings.ReplaceAll(inputCName, r.paramFromTarget, r.paramToTarget)
}
case RegexMatch:
pattern := regexp.MustCompile(r.paramFromTarget)
@@ -60,7 +60,7 @@ func (r *cnameTargetRule) getFromAndToTarget(inputCName string) (from string, to
substitution := r.paramToTarget
for groupIndex, groupValue := range regexGroups {
groupIndexStr := "{" + strconv.Itoa(groupIndex) + "}"
substitution = strings.Replace(substitution, groupIndexStr, groupValue, -1)
substitution = strings.ReplaceAll(substitution, groupIndexStr, groupValue)
}
return inputCName, substitution
}

6
plugin/rewrite/name.go
View File

@@ -40,7 +40,7 @@ func (r *regexStringRewriter) rewriteString(src string) string {
s := r.replacement
for groupIndex, groupValue := range regexGroups {
groupIndexStr := "{" + strconv.Itoa(groupIndex) + "}"
s = strings.Replace(s, groupIndexStr, groupValue, -1)
s = strings.ReplaceAll(s, groupIndexStr, groupValue)
}
return s
}
@@ -257,7 +257,7 @@ func newSubstringNameRule(nextAction string, auto bool, substring, replacement s
func (rule *substringNameRule) Rewrite(ctx context.Context, state request.Request) (ResponseRules, Result) {
if strings.Contains(state.Name(), rule.substring) {
state.Req.Question[0].Name = strings.Replace(state.Name(), rule.substring, rule.replacement, -1)
state.Req.Question[0].Name = strings.ReplaceAll(state.Name(), rule.substring, rule.replacement)
return rule.responseRuleFor(state)
}
return nil, RewriteIgnored
@@ -285,7 +285,7 @@ func (rule *regexNameRule) Rewrite(ctx context.Context, state request.Request) (
s := rule.replacement
for groupIndex, groupValue := range regexGroups {
groupIndexStr := "{" + strconv.Itoa(groupIndex) + "}"
s = strings.Replace(s, groupIndexStr, groupValue, -1)
s = strings.ReplaceAll(s, groupIndexStr, groupValue)
}
state.Req.Question[0].Name = s
return rule.responseRuleFor(state)

4
plugin/rewrite/rcode.go
View File

@@ -19,8 +19,8 @@ type rcodeResponseRule struct {
}
func (r *rcodeResponseRule) RewriteResponse(res *dns.Msg, rr dns.RR) {
if r.old == res.MsgHdr.Rcode {
res.MsgHdr.Rcode = r.new
if r.old == res.Rcode {
res.Rcode = r.new
}
}

4
plugin/rewrite/rcode_test.go
View File

@@ -60,13 +60,13 @@ func TestRCodeRewrite(t *testing.T) {
m.SetQuestion("srv1.coredns.rocks.", dns.TypeA)
m.Question[0].Qclass = dns.ClassINET
m.Answer = []dns.RR{test.A("srv1.coredns.rocks. 5 IN A 10.0.0.1")}
m.MsgHdr.Rcode = dns.RcodeServerFailure
m.Rcode = dns.RcodeServerFailure
request := request.Request{Req: m}
rcRule, _ := rule.(*exactRCodeRule)
var rr dns.RR
rcRule.response.RewriteResponse(request.Req, rr)
if request.Req.MsgHdr.Rcode != dns.RcodeFormatError {
if request.Req.Rcode != dns.RcodeFormatError {
t.Fatalf("RCode rewrite did not apply changes, request=%#v, err=%v", request.Req, err)
}
}

4
plugin/rewrite/rewrite.go
View File

@@ -54,7 +54,7 @@ func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
}
wr.ResponseRules = append(wr.ResponseRules, respRules...)
if rule.Mode() == Stop {
if !rw.RevertPolicy.DoRevert() {
if !rw.DoRevert() {
return plugin.NextOrFailure(rw.Name(), rw.Next, ctx, w, r)
}
rcode, err := plugin.NextOrFailure(rw.Name(), rw.Next, ctx, wr, r)
@@ -71,7 +71,7 @@ func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
}
}
}
if !rw.RevertPolicy.DoRevert() || len(wr.ResponseRules) == 0 {
if !rw.DoRevert() || len(wr.ResponseRules) == 0 {
return plugin.NextOrFailure(rw.Name(), rw.Next, ctx, w, r)
}
return plugin.NextOrFailure(rw.Name(), rw.Next, ctx, wr, r)