mirror of
https://github.com/juanfont/headscale.git
synced 2026-04-10 19:17:25 +02:00
all: fix golangci-lint issues (#3064)
This commit is contained in:
@@ -17,7 +17,7 @@ func GenerateRandomBytes(n int) ([]byte, error) {
|
||||
bytes := make([]byte, n)
|
||||
|
||||
// Note that err == nil only if we read len(b) bytes.
|
||||
if _, err := rand.Read(bytes); err != nil {
|
||||
if _, err := rand.Read(bytes); err != nil { //nolint:noinlineerr
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ func GenerateRandomStringURLSafe(n int) (string, error) {
|
||||
b, err := GenerateRandomBytes(n)
|
||||
|
||||
uenc := base64.RawURLEncoding.EncodeToString(b)
|
||||
|
||||
return uenc[:n], err
|
||||
}
|
||||
|
||||
@@ -42,13 +43,17 @@ func GenerateRandomStringURLSafe(n int) (string, error) {
|
||||
// number generator fails to function correctly, in which
|
||||
// case the caller should not continue.
|
||||
func GenerateRandomStringDNSSafe(size int) (string, error) {
|
||||
var str string
|
||||
var err error
|
||||
var (
|
||||
str string
|
||||
err error
|
||||
)
|
||||
|
||||
for len(str) < size {
|
||||
str, err = GenerateRandomStringURLSafe(size)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
str = strings.ToLower(
|
||||
strings.ReplaceAll(strings.ReplaceAll(str, "_", ""), "-", ""),
|
||||
)
|
||||
@@ -99,6 +104,7 @@ func TailcfgFilterRulesToString(rules []tailcfg.FilterRule) string {
|
||||
DstIPs: %v
|
||||
}
|
||||
`, rule.SrcIPs, rule.DstPorts))
|
||||
|
||||
if index < len(rules)-1 {
|
||||
sb.WriteString(", ")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user