Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-04-05 11:45:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

lint(revive): fix early-return violations (#7974)

Browse Source
This commit is contained in:
Ville Vesilehto
2026-03-30 02:59:22 +03:00
committed by GitHub
parent ff954b12b2
commit 54b06d9a3b
5 changed files with 69 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.golangci.yml
View File

@@ -60,7 +60,8 @@ linters:
- name: dot-imports - name: dot-imports
- name: early-return - name: early-return
disabled: true arguments:
- "preserveScope"
- name: empty-block - name: empty-block
disabled: true disabled: true

13
plugin/clouddns/setup.go
View File

@@ -69,15 +69,14 @@ func setup(c *caddy.Controller) error {
case "upstream": case "upstream":
c.RemainingArgs() c.RemainingArgs()
case "credentials": case "credentials":
if c.NextArg() { if !c.NextArg() {
credType, err := getCredType(c.Val())
if err != nil {
return plugin.Error("clouddns", c.Errf("invalid credentials file %q: %v", c.Val(), err))
}
opt = option.WithAuthCredentialsFile(credType, c.Val())
} else {
return plugin.Error("clouddns", c.ArgErr()) return plugin.Error("clouddns", c.ArgErr())
} }
credType, err := getCredType(c.Val())
if err != nil {
return plugin.Error("clouddns", c.Errf("invalid credentials file %q: %v", c.Val(), err))
}
opt = option.WithAuthCredentialsFile(credType, c.Val())
case "fallthrough": case "fallthrough":
fall.SetZonesFromArgs(c.RemainingArgs()) fall.SetZonesFromArgs(c.RemainingArgs())
default: default:

24
plugin/dnstap/setup.go
View File

@@ -46,25 +46,25 @@ func parseConfig(c *caddy.Controller) ([]*Dnstap, error) {
if len(args) >= 3 { if len(args) >= 3 {
tcpWriteBuf := args[2] tcpWriteBuf := args[2]
if v, err := strconv.Atoi(tcpWriteBuf); err == nil { v, err := strconv.Atoi(tcpWriteBuf)
if v < 1 || v > maxMultipleTcpWriteBuf { if err != nil {
return nil, c.Errf("dnstap: MultipleTcpWriteBuf must be between 1 and %d (MiB units): %d", maxMultipleTcpWriteBuf, v)
}
d.MultipleTcpWriteBuf = v
} else {
return nil, c.Errf("dnstap: invalid MultipleTcpWriteBuf %q: %v", tcpWriteBuf, err) return nil, c.Errf("dnstap: invalid MultipleTcpWriteBuf %q: %v", tcpWriteBuf, err)
} }
if v < 1 || v > maxMultipleTcpWriteBuf {
return nil, c.Errf("dnstap: MultipleTcpWriteBuf must be between 1 and %d (MiB units): %d", maxMultipleTcpWriteBuf, v)
}
d.MultipleTcpWriteBuf = v
} }
if len(args) >= 4 { if len(args) >= 4 {
qSize := args[3] qSize := args[3]
if v, err := strconv.Atoi(qSize); err == nil { v, err := strconv.Atoi(qSize)
if v < 1 || v > maxMultipleQueue { if err != nil {
return nil, c.Errf("dnstap: MultipleQueue must be between 1 and %d (x10k messages): %d", maxMultipleQueue, v)
}
d.MultipleQueue = v
} else {
return nil, c.Errf("dnstap: invalid MultipleQueue %q: %v", qSize, err) return nil, c.Errf("dnstap: invalid MultipleQueue %q: %v", qSize, err)
} }
if v < 1 || v > maxMultipleQueue {
return nil, c.Errf("dnstap: MultipleQueue must be between 1 and %d (x10k messages): %d", maxMultipleQueue, v)
}
d.MultipleQueue = v
} }
var dio *dio var dio *dio

60
plugin/rewrite/rewrite_test.go
View File

@@ -666,42 +666,42 @@ func optsEqual(a, b []dns.EDNS0) bool {
for i := range a { for i := range a {
switch aa := a[i].(type) { switch aa := a[i].(type) {
case *dns.EDNS0_LOCAL: case *dns.EDNS0_LOCAL:
if bb, ok := b[i].(*dns.EDNS0_LOCAL); ok { bb, ok := b[i].(*dns.EDNS0_LOCAL)
if aa.Code != bb.Code { if !ok {
return false return false
} }
if !bytes.Equal(aa.Data, bb.Data) { if aa.Code != bb.Code {
return false return false
} }
} else { if !bytes.Equal(aa.Data, bb.Data) {
return false return false
} }
case *dns.EDNS0_NSID: case *dns.EDNS0_NSID:
if bb, ok := b[i].(*dns.EDNS0_NSID); ok { bb, ok := b[i].(*dns.EDNS0_NSID)
if aa.Nsid != bb.Nsid { if !ok {
return false return false
} }
} else { if aa.Nsid != bb.Nsid {
return false return false
} }
case *dns.EDNS0_SUBNET: case *dns.EDNS0_SUBNET:
if bb, ok := b[i].(*dns.EDNS0_SUBNET); ok { bb, ok := b[i].(*dns.EDNS0_SUBNET)
if aa.Code != bb.Code { if !ok {
return false return false
} }
if aa.Family != bb.Family { if aa.Code != bb.Code {
return false return false
} }
if aa.SourceNetmask != bb.SourceNetmask { if aa.Family != bb.Family {
return false return false
} }
if aa.SourceScope != bb.SourceScope { if aa.SourceNetmask != bb.SourceNetmask {
return false return false
} }
if !aa.Address.Equal(bb.Address) { if aa.SourceScope != bb.SourceScope {
return false return false
} }
} else { if !aa.Address.Equal(bb.Address) {
return false return false
} }

41
plugin/route53/setup.go
View File

@@ -96,21 +96,19 @@ func setup(c *caddy.Controller) error {
cfgOpts = append(cfgOpts, config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(v[0], v[1], ""))) cfgOpts = append(cfgOpts, config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(v[0], v[1], "")))
log.Warningf("Save aws_access_key in Corefile has been deprecated, please use other authentication methods instead") log.Warningf("Save aws_access_key in Corefile has been deprecated, please use other authentication methods instead")
case "aws_endpoint": case "aws_endpoint":
if c.NextArg() { if !c.NextArg() {
clientOpts = append(clientOpts, func(o *route53.Options) {
o.BaseEndpoint = aws.String(c.Val())
})
} else {
return plugin.Error("route53", c.ArgErr()) return plugin.Error("route53", c.ArgErr())
} }
clientOpts = append(clientOpts, func(o *route53.Options) {
o.BaseEndpoint = aws.String(c.Val())
})
case "upstream": case "upstream":
c.RemainingArgs() // eats args c.RemainingArgs() // eats args
case "credentials": case "credentials":
if c.NextArg() { if !c.NextArg() {
cfgOpts = append(cfgOpts, config.WithSharedConfigProfile(c.Val()))
} else {
return c.ArgErr() return c.ArgErr()
} }
cfgOpts = append(cfgOpts, config.WithSharedConfigProfile(c.Val()))
if c.NextArg() { if c.NextArg() {
sharedConfigFiles := []string{c.Val()} sharedConfigFiles := []string{c.Val()}
// If AWS_SDK_LOAD_CONFIG is set also load ~/.aws/config to stay consistent // If AWS_SDK_LOAD_CONFIG is set also load ~/.aws/config to stay consistent
@@ -123,22 +121,21 @@ func setup(c *caddy.Controller) error {
case "fallthrough": case "fallthrough":
fall.SetZonesFromArgs(c.RemainingArgs()) fall.SetZonesFromArgs(c.RemainingArgs())
case "refresh": case "refresh":
if c.NextArg() { if !c.NextArg() {
refreshStr := c.Val()
_, err := strconv.Atoi(refreshStr)
if err == nil {
refreshStr = c.Val() + "s"
}
refresh, err = time.ParseDuration(refreshStr)
if err != nil {
return plugin.Error("route53", c.Errf("Unable to parse duration: %v", err))
}
if refresh <= 0 {
return plugin.Error("route53", c.Errf("refresh interval must be greater than 0: %q", refreshStr))
}
} else {
return plugin.Error("route53", c.ArgErr()) return plugin.Error("route53", c.ArgErr())
} }
refreshStr := c.Val()
_, err := strconv.Atoi(refreshStr)
if err == nil {
refreshStr = c.Val() + "s"
}
refresh, err = time.ParseDuration(refreshStr)
if err != nil {
return plugin.Error("route53", c.Errf("Unable to parse duration: %v", err))
}
if refresh <= 0 {
return plugin.Error("route53", c.Errf("refresh interval must be greater than 0: %q", refreshStr))
}
default: default:
return plugin.Error("route53", c.Errf("unknown property %q", c.Val())) return plugin.Error("route53", c.Errf("unknown property %q", c.Val()))
} }