Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-09 11:55:13 -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

2
plugin/loadbalance/setup.go
View File

@@ -15,7 +15,7 @@ import (
)
var log = clog.NewWithPlugin("loadbalance")
var errOpen = errors.New("Weight file open error")
var errOpen = errors.New("weight file open error")
func init() { plugin.Register("loadbalance", setup) }

14
plugin/loadbalance/weighted.go
View File

@@ -90,7 +90,7 @@ func createWeightedFuncs(weightFileName string,
randomGen: &randomUint{},
},
}
lb.weighted.randomGen.randInit()
lb.weighted.randInit()
lb.shuffleFunc = func(res *dns.Msg) *dns.Msg {
return weightedShuffle(res, lb.weighted)
@@ -285,7 +285,7 @@ func (w *weightedRR) parseWeights(scanner *bufio.Scanner) (map[string]weights, e
case 1:
// (domain) name sanity check
if net.ParseIP(fields[0]) != nil {
return nil, fmt.Errorf("Wrong domain name:\"%s\" in weight file %s. (Maybe a missing weight value?)",
return nil, fmt.Errorf("wrong domain name:\"%s\" in weight file %s. (Maybe a missing weight value?)",
fields[0], w.fileName)
}
dname = fields[0]
@@ -304,25 +304,25 @@ func (w *weightedRR) parseWeights(scanner *bufio.Scanner) (map[string]weights, e
// IP address and weight value
ip := net.ParseIP(fields[0])
if ip == nil {
return nil, fmt.Errorf("Wrong IP address:\"%s\" in weight file %s", fields[0], w.fileName)
return nil, fmt.Errorf("wrong IP address:\"%s\" in weight file %s", fields[0], w.fileName)
}
weight, err := strconv.ParseUint(fields[1], 10, 8)
if err != nil || weight == 0 {
return nil, fmt.Errorf("Wrong weight value:\"%s\" in weight file %s", fields[1], w.fileName)
return nil, fmt.Errorf("wrong weight value:\"%s\" in weight file %s", fields[1], w.fileName)
}
witem := &weightItem{address: ip, value: uint8(weight)}
if dname == "" {
return nil, fmt.Errorf("Missing domain name in weight file %s", w.fileName)
return nil, fmt.Errorf("missing domain name in weight file %s", w.fileName)
}
ws = append(ws, witem)
domains[dname] = ws
default:
return nil, fmt.Errorf("Could not parse weight line:\"%s\" in weight file %s", nextLine, w.fileName)
return nil, fmt.Errorf("could not parse weight line:\"%s\" in weight file %s", nextLine, w.fileName)
}
}
if err := scanner.Err(); err != nil {
return nil, fmt.Errorf("Weight file %s parsing error:%s", w.fileName, err)
return nil, fmt.Errorf("weight file %s parsing error:%s", w.fileName, err)
}
return domains, nil

10
plugin/loadbalance/weighted_test.go
View File

@@ -96,11 +96,11 @@ func TestWeightFileUpdate(t *testing.T) {
{oneDomainWRR, false, testOneDomainWRR, ""},
{twoDomainsWRR, false, testTwoDomainsWRR, ""},
// negative
{missingWeightWRR, true, nil, "Wrong domain name"},
{missingDomainWRR, true, nil, "Missing domain name"},
{wrongIpWRR, true, nil, "Wrong IP address"},
{wrongWeightWRR, true, nil, "Wrong weight value"},
{zeroWeightWRR, true, nil, "Wrong weight value"},
{missingWeightWRR, true, nil, "wrong domain name"},
{missingDomainWRR, true, nil, "missing domain name"},
{wrongIpWRR, true, nil, "wrong IP address"},
{wrongWeightWRR, true, nil, "wrong weight value"},
{zeroWeightWRR, true, nil, "wrong weight value"},
}
for i, test := range tests {