Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup code by lint (#3312)

Browse Source 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
This commit is contained in:
Guangming Wang
2019-09-27 18:10:34 +08:00
committed by Miek Gieben
parent f2df37a1fe
commit 8af4685587
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/rewrite/name.go
View File

@@ -104,9 +104,7 @@ func (rule *regexNameRule) Rewrite(ctx context.Context, state request.Request) R
s := rule.Replacement
for groupIndex, groupValue := range regexGroups {
groupIndexStr := "{" + strconv.Itoa(groupIndex) + "}"
if strings.Contains(s, groupIndexStr) {
s = strings.Replace(s, groupIndexStr, groupValue, -1)
}
s = strings.Replace(s, groupIndexStr, groupValue, -1)
}
state.Req.Question[0].Name = s
return RewriteDone
@@ -264,10 +262,7 @@ func (rule *regexNameRule) GetResponseRule() ResponseRule { return rule.Response
// hasClosingDot return true if s has a closing dot at the end.
func hasClosingDot(s string) bool {
if strings.HasSuffix(s, ".") {
return true
}
return false
return strings.HasSuffix(s, ".")
}
// getSubExprUsage return the number of subexpressions used in s.

4
plugin/rewrite/reverter.go
View File

@@ -59,9 +59,7 @@ func (r *ResponseReverter) WriteMsg(res *dns.Msg) error {
s := rule.Replacement
for groupIndex, groupValue := range regexGroups {
groupIndexStr := "{" + strconv.Itoa(groupIndex) + "}"
if strings.Contains(s, groupIndexStr) {
s = strings.Replace(s, groupIndexStr, groupValue, -1)
}
s = strings.Replace(s, groupIndexStr, groupValue, -1)
}
name = s
isNameRewritten = true

2
plugin/rewrite/rewrite_test.go
View File

@@ -422,7 +422,7 @@ func optsEqual(a, b []dns.EDNS0) bool {
if aa.SourceScope != bb.SourceScope {
return false
}
if !bytes.Equal(aa.Address, bb.Address) {
if !aa.Address.Equal(bb.Address) {
return false
}
} else {