Fix linting errors

This commit is contained in:
Patrick Pacher
2024-03-27 16:17:58 +01:00
parent 653a365bce
commit 61176af14e
48 changed files with 167 additions and 153 deletions

View File

@@ -2,9 +2,9 @@ package intel
import (
"context"
"fmt"
"net"
"sort"
"strconv"
"strings"
"sync"
@@ -433,7 +433,7 @@ func (e *Entity) getASNLists(ctx context.Context) {
}
e.loadAsnListOnce.Do(func() {
asnStr := fmt.Sprintf("%d", asn)
asnStr := strconv.FormatUint(uint64(asn), 10)
list, err := filterlists.LookupASNString(asnStr)
if err != nil {
log.Tracer(ctx).Errorf("intel: failed to get ASN blocklist for %d: %s", asn, err)

View File

@@ -103,18 +103,19 @@ func parseHeader(r io.Reader) (compressed bool, format byte, err error) {
if _, err = r.Read(listHeader[:]); err != nil {
// if we have an error here we can safely abort because
// the file must be broken
return
return compressed, format, err
}
if listHeader[0] != dsd.LIST {
err = fmt.Errorf("unexpected file type: %d (%c), expected dsd list", listHeader[0], listHeader[0])
return
return compressed, format, err
}
var compression [1]byte
if _, err = r.Read(compression[:]); err != nil {
// same here, a DSDL file must have at least 2 bytes header
return
return compressed, format, err
}
if compression[0] == dsd.GZIP {
@@ -122,15 +123,16 @@ func parseHeader(r io.Reader) (compressed bool, format byte, err error) {
var formatSlice [1]byte
if _, err = r.Read(formatSlice[:]); err != nil {
return
return compressed, format, err
}
format = formatSlice[0]
return
return compressed, format, err
}
format = compression[0]
return // nolint:nakedret
return compressed, format, err
}
// byteReader extends an io.Reader to implement the ByteReader interface.

View File

@@ -1,7 +1,7 @@
package geoip
import (
"fmt"
"errors"
"net"
"github.com/oschwald/maxminddb-golang"
@@ -16,7 +16,7 @@ func getReader(ip net.IP) *maxminddb.Reader {
func GetLocation(ip net.IP) (*Location, error) {
db := getReader(ip)
if db == nil {
return nil, fmt.Errorf("geoip database not available")
return nil, errors.New("geoip database not available")
}
record := &Location{}
if err := db.Lookup(ip, record); err != nil {