johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: fix various lint issues

Browse Source 
revive default configuration has changed in 1.3.0. Some stuff is a bit
silly (like empty blocks), but I find it easier to follow that than to
try to tweak the configuration.
This commit is contained in:
Vincent Bernat
2023-03-21 00:01:13 +01:00
parent 1408634bad
commit 1ec89aac1f
17 changed files with 41 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/config.go
View File

@@ -189,9 +189,9 @@ func DefaultHook() (mapstructure.DecodeHookFunc, func()) {
} }
} }
if to.IsNil() { if to.IsNil() {
new := reflect.New(to.Type().Elem()) newV := reflect.New(to.Type().Elem())
method.Func.Call([]reflect.Value{new}) method.Func.Call([]reflect.Value{newV})
to.Set(new) to.Set(newV)
return from.Interface(), nil return from.Interface(), nil
} }
method.Func.Call([]reflect.Value{to}) method.Func.Call([]reflect.Value{to})

2
common/daemon/tests.go
View File

@@ -39,5 +39,5 @@ func (c *MockComponent) Stop() error {
} }
// Track does nothing // Track does nothing
func (c *MockComponent) Track(t *tomb.Tomb, who string) { func (c *MockComponent) Track(_ *tomb.Tomb, _ string) {
} }

6
common/helpers/mapstructure.go
View File

@@ -148,9 +148,9 @@ func ParametrizedConfigurationUnmarshallerHook[OuterConfiguration any, InnerConf
// Use the value we already have instead of default. // Use the value we already have instead of default.
original = reflect.Indirect(configField.Elem()) original = reflect.Indirect(configField.Elem())
} }
copy := reflect.New(original.Type()) copied := reflect.New(original.Type())
copy.Elem().Set(reflect.ValueOf(original.Interface())) copied.Elem().Set(reflect.ValueOf(original.Interface()))
configField.Set(copy) configField.Set(copied)
// Resume decoding // Resume decoding
return from.Interface(), nil return from.Interface(), nil

6
common/helpers/race/norace.go
View File

@@ -20,13 +20,13 @@ func Enable() {
} }
// Acquire has the same semantics as runtime.Acquire. // Acquire has the same semantics as runtime.Acquire.
func Acquire(addr unsafe.Pointer) { func Acquire(_ unsafe.Pointer) {
} }
// Release has the same semantics as runtime.Release. // Release has the same semantics as runtime.Release.
func Release(addr unsafe.Pointer) { func Release(_ unsafe.Pointer) {
} }
// ReleaseMerge has the same semantics as runtime.ReleaseMerge. // ReleaseMerge has the same semantics as runtime.ReleaseMerge.
func ReleaseMerge(addr unsafe.Pointer) { func ReleaseMerge(_ unsafe.Pointer) {
} }

4
common/reporter/logger/root.go
View File

@@ -28,7 +28,7 @@ type Logger struct {
} }
// New creates a new logger // New creates a new logger
func New(config Configuration) (Logger, error) { func New(_ Configuration) (Logger, error) {
// Initialize the logger // Initialize the logger
logger := log.Logger.Hook(contextHook{}) logger := log.Logger.Hook(contextHook{})
return Logger{logger}, nil return Logger{logger}, nil
@@ -37,7 +37,7 @@ func New(config Configuration) (Logger, error) {
type contextHook struct{} type contextHook struct{}
// Run adds more context to an event, including "module" and "caller". // Run adds more context to an event, including "module" and "caller".
func (h contextHook) Run(e *zerolog.Event, level zerolog.Level, msg string) { func (h contextHook) Run(e *zerolog.Event, _ zerolog.Level, _ string) {
callStack := stack.Callers() callStack := stack.Callers()
callStack = callStack[3:] // Trial and error, there is a test to check it works callStack = callStack[3:] // Trial and error, there is a test to check it works
caller := callStack[0].SourceFile(true) caller := callStack[0].SourceFile(true)

6
common/schema/definition_test.go
View File

@@ -44,9 +44,9 @@ func TestColumnIndex(t *testing.T) {
func TestFinalizeTwice(t *testing.T) { func TestFinalizeTwice(t *testing.T) {
c := NewMock(t) c := NewMock(t)
old := c.Schema oldSchema := c.Schema
new := c.finalize() newSchema := c.finalize()
if diff := helpers.Diff(old, new, helpers.DiffUnexported); diff != "" { if diff := helpers.Diff(oldSchema, newSchema, helpers.DiffUnexported); diff != "" {
t.Fatalf("finalize() (-old, +new):\n%s", diff) t.Fatalf("finalize() (-old, +new):\n%s", diff)
} }
} }

8
console/database/logs.go
View File

@@ -22,19 +22,19 @@ func (l *logger) LogMode(gormlogger.LogLevel) gormlogger.Interface {
return l return l
} }
func (l *logger) Info(ctx context.Context, s string, args ...interface{}) { func (l *logger) Info(_ context.Context, s string, args ...interface{}) {
l.r.Info().Msgf(s, args...) l.r.Info().Msgf(s, args...)
} }
func (l *logger) Warn(ctx context.Context, s string, args ...interface{}) { func (l *logger) Warn(_ context.Context, s string, args ...interface{}) {
l.r.Warn().Msgf(s, args...) l.r.Warn().Msgf(s, args...)
} }
func (l *logger) Error(ctx context.Context, s string, args ...interface{}) { func (l *logger) Error(_ context.Context, s string, args ...interface{}) {
l.r.Error().Msgf(s, args...) l.r.Error().Msgf(s, args...)
} }
func (l *logger) Trace(ctx context.Context, begin time.Time, fc func() (string, int64), err error) { func (l *logger) Trace(_ context.Context, begin time.Time, fc func() (string, int64), err error) {
elapsed := time.Since(begin) elapsed := time.Since(begin)
sql, _ := fc() sql, _ := fc()
fields := gin.H{ fields := gin.H{

5
console/database/root.go
View File

@@ -49,10 +49,7 @@ func (c *Component) Start() error {
if err := c.db.AutoMigrate(&SavedFilter{}); err != nil { if err := c.db.AutoMigrate(&SavedFilter{}); err != nil {
return fmt.Errorf("cannot migrate database: %w", err) return fmt.Errorf("cannot migrate database: %w", err)
} }
if err := c.populate(); err != nil { return c.populate()
return err
}
return nil
} }
// Stop stops the database component. // Stop stops the database component.

6
console/docs.go
View File

@@ -135,7 +135,7 @@ func (c *Component) docsHandlerFunc(gc *gin.Context) {
type internalLinkTransformer struct{} type internalLinkTransformer struct{}
func (r *internalLinkTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) { func (r *internalLinkTransformer) Transform(node *ast.Document, _ text.Reader, _ parser.Context) {
replaceLinks := func(n ast.Node, entering bool) (ast.WalkStatus, error) { replaceLinks := func(n ast.Node, entering bool) (ast.WalkStatus, error) {
if !entering { if !entering {
return ast.WalkContinue, nil return ast.WalkContinue, nil
@@ -156,7 +156,7 @@ type imageEmbedder struct {
root fs.FS root fs.FS
} }
func (r *imageEmbedder) Transform(node *ast.Document, reader text.Reader, pc parser.Context) { func (r *imageEmbedder) Transform(node *ast.Document, _ text.Reader, _ parser.Context) {
replaceLinks := func(n ast.Node, entering bool) (ast.WalkStatus, error) { replaceLinks := func(n ast.Node, entering bool) (ast.WalkStatus, error) {
if !entering { if !entering {
return ast.WalkContinue, nil return ast.WalkContinue, nil
@@ -187,7 +187,7 @@ type tocLogger struct {
headers []Header headers []Header
} }
func (r *tocLogger) Transform(node *ast.Document, reader text.Reader, pc parser.Context) { func (r *tocLogger) Transform(node *ast.Document, reader text.Reader, _ parser.Context) {
r.headers = []Header{} r.headers = []Header{}
logHeaders := func(n ast.Node, entering bool) (ast.WalkStatus, error) { logHeaders := func(n ast.Node, entering bool) (ast.WalkStatus, error) {
if !entering { if !entering {

12
inlet/bmp/events.go
View File

@@ -183,10 +183,10 @@ func (c *Component) handlePeerUpNotification(pkey peerKey, body *bmp.BMPPeerUpNo
for _, param := range received.OptParams { for _, param := range received.OptParams {
switch param := param.(type) { switch param := param.(type) {
case *bgp.OptionParameterCapability: case *bgp.OptionParameterCapability:
for _, cap := range param.Capability { for _, capability := range param.Capability {
switch cap := cap.(type) { switch capability := capability.(type) {
case *bgp.CapAddPath: case *bgp.CapAddPath:
for _, tuple := range cap.Tuples { for _, tuple := range capability.Tuples {
receivedAddPath[tuple.RouteFamily] = tuple.Mode receivedAddPath[tuple.RouteFamily] = tuple.Mode
} }
} }
@@ -198,10 +198,10 @@ func (c *Component) handlePeerUpNotification(pkey peerKey, body *bmp.BMPPeerUpNo
for _, param := range sent.OptParams { for _, param := range sent.OptParams {
switch param := param.(type) { switch param := param.(type) {
case *bgp.OptionParameterCapability: case *bgp.OptionParameterCapability:
for _, cap := range param.Capability { for _, capability := range param.Capability {
switch cap := cap.(type) { switch capability := capability.(type) {
case *bgp.CapAddPath: case *bgp.CapAddPath:
for _, sent := range cap.Tuples { for _, sent := range capability.Tuples {
receivedMode := receivedAddPath[sent.RouteFamily] receivedMode := receivedAddPath[sent.RouteFamily]
if receivedMode == bgp.BGP_ADD_PATH_BOTH || receivedMode == bgp.BGP_ADD_PATH_SEND { if receivedMode == bgp.BGP_ADD_PATH_BOTH || receivedMode == bgp.BGP_ADD_PATH_SEND {
if sent.Mode == bgp.BGP_ADD_PATH_BOTH || sent.Mode == bgp.BGP_ADD_PATH_RECEIVE { if sent.Mode == bgp.BGP_ADD_PATH_BOTH || sent.Mode == bgp.BGP_ADD_PATH_RECEIVE {

7
inlet/core/enricher_test.go
View File

@@ -547,12 +547,11 @@ ClassifyProviderRegex(Interface.Description, "^Transit: ([^ ]+)", "$1")`,
} }
return nil return nil
}) })
} else {
// We should not get a message, but that's not possible to test.
} }
flowComponent.Inject(t, tc.InputFlow()) // Else, we should not get a message, but that's not possible to test.
flowComponent.Inject(tc.InputFlow())
time.Sleep(50 * time.Millisecond) // Needed to let poller does its job time.Sleep(50 * time.Millisecond) // Needed to let poller does its job
flowComponent.Inject(t, tc.InputFlow()) flowComponent.Inject(tc.InputFlow())
if tc.OutputFlow != nil { if tc.OutputFlow != nil {
select { select {
case <-received: case <-received:

7
inlet/flow/decoder/netflow/decode.go
View File

@@ -20,16 +20,13 @@ func (nd *Decoder) decode(msgDec interface{}, samplingRateSys producer.SamplingR
var obsDomainID uint32 var obsDomainID uint32
var dataFlowSet []netflow.DataFlowSet var dataFlowSet []netflow.DataFlowSet
var optionsDataFlowSet []netflow.OptionsDataFlowSet var optionsDataFlowSet []netflow.OptionsDataFlowSet
var version int
switch msgDecConv := msgDec.(type) { switch msgDecConv := msgDec.(type) {
case netflow.NFv9Packet: case netflow.NFv9Packet:
dataFlowSet, _, _, optionsDataFlowSet = producer.SplitNetFlowSets(msgDecConv) dataFlowSet, _, _, optionsDataFlowSet = producer.SplitNetFlowSets(msgDecConv)
obsDomainID = msgDecConv.SourceId obsDomainID = msgDecConv.SourceId
version = 9
case netflow.IPFIXPacket: case netflow.IPFIXPacket:
dataFlowSet, _, _, optionsDataFlowSet = producer.SplitIPFIXSets(msgDecConv) dataFlowSet, _, _, optionsDataFlowSet = producer.SplitIPFIXSets(msgDecConv)
obsDomainID = msgDecConv.ObservationDomainId obsDomainID = msgDecConv.ObservationDomainId
version = 10
default: default:
return nil return nil
} }
@@ -47,7 +44,7 @@ func (nd *Decoder) decode(msgDec interface{}, samplingRateSys producer.SamplingR
// Parse fields // Parse fields
for _, dataFlowSetItem := range dataFlowSet { for _, dataFlowSetItem := range dataFlowSet {
for _, record := range dataFlowSetItem.Records { for _, record := range dataFlowSetItem.Records {
flow := nd.decodeRecord(version, record.Values) flow := nd.decodeRecord(record.Values)
if flow != nil { if flow != nil {
flow.SamplingRate = samplingRate flow.SamplingRate = samplingRate
flowMessageSet = append(flowMessageSet, flow) flowMessageSet = append(flowMessageSet, flow)
@@ -58,7 +55,7 @@ func (nd *Decoder) decode(msgDec interface{}, samplingRateSys producer.SamplingR
return flowMessageSet return flowMessageSet
} }
func (nd *Decoder) decodeRecord(version int, fields []netflow.DataField) *schema.FlowMessage { func (nd *Decoder) decodeRecord(fields []netflow.DataField) *schema.FlowMessage {
var etype uint16 var etype uint16
bf := &schema.FlowMessage{} bf := &schema.FlowMessage{}
for _, field := range fields { for _, field := range fields {

2
inlet/flow/tests.go
View File

@@ -44,6 +44,6 @@ func NewMock(t *testing.T, r *reporter.Reporter, config Configuration) *Componen
} }
// Inject inject the provided flow message, as if it was received. // Inject inject the provided flow message, as if it was received.
func (c *Component) Inject(t *testing.T, fmsg *schema.FlowMessage) { func (c *Component) Inject(fmsg *schema.FlowMessage) {
c.outgoingFlows <- fmsg c.outgoingFlows <- fmsg
} }

4
inlet/snmp/config.go
View File

@@ -117,9 +117,7 @@ func ConfigurationUnmarshallerHook() mapstructure.DecodeHookFunc {
// communities should contain ::/0 // communities should contain ::/0
if mapKey == nil { if mapKey == nil {
from.SetMapIndex(reflect.ValueOf("communities"), reflect.ValueOf("public")) from.SetMapIndex(reflect.ValueOf("communities"), reflect.ValueOf("public"))
} else if communities.Kind() == reflect.String { } else if communities.Kind() != reflect.String && !communities.MapIndex(reflect.ValueOf("::/0")).IsValid() {
// Do nothing
} else if !communities.MapIndex(reflect.ValueOf("::/0")).IsValid() {
communities.SetMapIndex(reflect.ValueOf("::/0"), reflect.ValueOf("public")) communities.SetMapIndex(reflect.ValueOf("::/0"), reflect.ValueOf("public"))
} }
} }

5
inlet/snmp/poller.go
View File

@@ -235,10 +235,7 @@ func (p *realPoller) Poll(ctx context.Context, exporter, agent netip.Addr, port
ifIndex := ifIndexes[(idx-1)/3] ifIndex := ifIndexes[(idx-1)/3]
ok := true ok := true
// We do not process results when index is 0 (this can happen for local // We do not process results when index is 0 (this can happen for local
// traffic, we only care for exporter name). // traffic, we only care for exporter name). ifDescr is not mandatory.
if ifIndex > 0 && !processStr(idx, "ifdescr", &ifDescrVal) {
// This is not mandatory.
}
if ifIndex > 0 && !processStr(idx+1, "ifalias", &ifAliasVal) { if ifIndex > 0 && !processStr(idx+1, "ifalias", &ifAliasVal) {
ok = false ok = false
} }

6
inlet/snmp/root_test.go
View File

@@ -185,7 +185,7 @@ type logCoalescePoller struct {
received []lookupRequest received []lookupRequest
} }
func (fcp *logCoalescePoller) Poll(ctx context.Context, exporterIP, agentIP netip.Addr, port uint16, ifIndexes []uint) error { func (fcp *logCoalescePoller) Poll(_ context.Context, exporterIP, _ netip.Addr, _ uint16, ifIndexes []uint) error {
fcp.received = append(fcp.received, lookupRequest{exporterIP, ifIndexes}) fcp.received = append(fcp.received, lookupRequest{exporterIP, ifIndexes})
return nil return nil
} }
@@ -235,7 +235,7 @@ func TestCoalescing(t *testing.T) {
type errorPoller struct{} type errorPoller struct{}
func (fcp *errorPoller) Poll(ctx context.Context, exporterIP, agentIP netip.Addr, port uint16, ifIndexes []uint) error { func (fcp *errorPoller) Poll(_ context.Context, _, _ netip.Addr, _ uint16, _ []uint) error {
return errors.New("noooo") return errors.New("noooo")
} }
@@ -285,7 +285,7 @@ type agentLogPoller struct {
mu sync.Mutex mu sync.Mutex
} }
func (alp *agentLogPoller) Poll(ctx context.Context, exporterIP, agentIP netip.Addr, port uint16, ifIndexes []uint) error { func (alp *agentLogPoller) Poll(_ context.Context, exporterIP, agentIP netip.Addr, _ uint16, _ []uint) error {
alp.mu.Lock() alp.mu.Lock()
defer alp.mu.Unlock() defer alp.mu.Unlock()
alp.lastExporter = exporterIP.Unmap().String() alp.lastExporter = exporterIP.Unmap().String()

2
inlet/snmp/tests.go
View File

@@ -31,7 +31,7 @@ func newMockPoller(configuration Configuration, put func(netip.Addr, string, uin
} }
// Poll just builds synthetic data. // Poll just builds synthetic data.
func (p *mockPoller) Poll(ctx context.Context, exporter, agent netip.Addr, port uint16, ifIndexes []uint) error { func (p *mockPoller) Poll(_ context.Context, exporter, _ netip.Addr, _ uint16, ifIndexes []uint) error {
for _, ifIndex := range ifIndexes { for _, ifIndex := range ifIndexes {
if p.config.Communities.LookupOrDefault(exporter, "public") == "public" { if p.config.Communities.LookupOrDefault(exporter, "public") == "public" {
p.put(exporter, strings.ReplaceAll(exporter.Unmap().String(), ".", "_"), ifIndex, Interface{ p.put(exporter, strings.ReplaceAll(exporter.Unmap().String(), ".", "_"), ifIndex, Interface{