lint: unused parameters / 2 (#4055)

* lint: unused parameters / 2

* lint (print, spacing)

Author: mmetc

cmd/crowdsec-cli/clisetup/setup/systemd_test.go

@@ -21,7 +21,7 @@ func fakeExecCommand(ctx context.Context, command string, args ...string) *exec.
 	return cmd
 }
 
-func TestHelperProcess(t *testing.T) {
+func TestHelperProcess(_ *testing.T) {
 	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
 		return
 	}

cmd/crowdsec/output.go

@@ -15,7 +15,7 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/pipeline"
 )
 
-func dedupAlerts(alerts []pipeline.RuntimeAlert) ([]*models.Alert, error) {
+func dedupAlerts(alerts []pipeline.RuntimeAlert) []*models.Alert {
 	var dedupCache []*models.Alert
 
 	for idx, alert := range alerts {
@@ -41,16 +41,13 @@ func dedupAlerts(alerts []pipeline.RuntimeAlert) ([]*models.Alert, error) {
 		log.Tracef("went from %d to %d alerts", len(alerts), len(dedupCache))
 	}
 
-	return dedupCache, nil
+	return dedupCache
 }
 
 func PushAlerts(ctx context.Context, alerts []pipeline.RuntimeAlert, client *apiclient.ApiClient) error {
-	alertsToPush, err := dedupAlerts(alerts)
-	if err != nil {
-		return fmt.Errorf("failed to transform alerts for api: %w", err)
-	}
+	alertsToPush := dedupAlerts(alerts)
 
-	_, _, err = client.Alerts.Add(ctx, alertsToPush)
+	_, _, err := client.Alerts.Add(ctx, alertsToPush)
 	if err != nil {
 		return fmt.Errorf("failed sending alert to LAPI: %w", err)
 	}
@@ -116,19 +113,24 @@ func runOutput(ctx context.Context, input chan pipeline.Event, overflow chan pip
 			if err != nil {
 				return fmt.Errorf("postoverflow failed: %w", err)
 			}
-			log.Printf("%s", *event.Overflow.Alert.Message)
+
+			log.Info(*event.Overflow.Alert.Message)
+
 			// if the Alert is nil, it's to signal bucket is ready for GC, don't track this
 			// dump after postoveflow processing to avoid missing whitelist info
 			if dumpStates && event.Overflow.Alert != nil {
 				if bucketOverflows == nil {
 					bucketOverflows = make([]pipeline.Event, 0)
 				}
+
 				bucketOverflows = append(bucketOverflows, event)
 			}
+
 			if event.Overflow.Whitelisted {
-				log.Printf("[%s] is whitelisted, skip.", *event.Overflow.Alert.Message)
+				log.Infof("[%s] is whitelisted, skip.", *event.Overflow.Alert.Message)
 				continue
 			}
+
 			if event.Overflow.Reprocess {
 				log.Debugf("Overflow being reprocessed.")
 				select {

pkg/cwhub/hub_test.go

@@ -42,10 +42,8 @@ func testHubCfg(t *testing.T) *csconfig.LocalHubCfg {
 	return &local
 }
 
-func testHub(t *testing.T, localCfg *csconfig.LocalHubCfg, indexJSON string) (*Hub, error) {
-	if localCfg == nil {
-		localCfg = testHubCfg(t)
-	}
+func testHub(t *testing.T, indexJSON string) (*Hub, error) {
+	localCfg := testHubCfg(t)
 
 	err := os.WriteFile(localCfg.HubIndexFile, []byte(indexJSON), 0o644)
 	require.NoError(t, err)
@@ -60,47 +58,47 @@ func testHub(t *testing.T, localCfg *csconfig.LocalHubCfg, indexJSON string) (*H
 
 func TestIndexEmpty(t *testing.T) {
 	// an empty hub is valid, and should not have warnings
-	hub, err := testHub(t, nil, "{}")
+	hub, err := testHub(t, "{}")
 	require.NoError(t, err)
 	assert.Empty(t, hub.Warnings)
 }
 
 func TestIndexJSON(t *testing.T) {
 	// but it can't be an empty string
-	hub, err := testHub(t, nil, "")
+	hub, err := testHub(t, "")
 	cstest.RequireErrorContains(t, err, "invalid hub index: failed to parse index: unexpected end of JSON input")
 	assert.NotNil(t, hub)
 	assert.Empty(t, hub.Warnings)
 
 	// it must be valid json
-	hub, err = testHub(t, nil, "def not json")
+	hub, err = testHub(t, "def not json")
 	cstest.RequireErrorContains(t, err, "invalid hub index: failed to parse index: invalid character 'd' looking for beginning of value. Run 'sudo cscli hub update' to download the index again")
 	assert.NotNil(t, hub)
 	assert.Empty(t, hub.Warnings)
 
-	hub, err = testHub(t, nil, "{")
+	hub, err = testHub(t, "{")
 	cstest.RequireErrorContains(t, err, "invalid hub index: failed to parse index: unexpected end of JSON input")
 	assert.NotNil(t, hub)
 	assert.Empty(t, hub.Warnings)
 
 	// and by json we mean an object
-	hub, err = testHub(t, nil, "[]")
+	hub, err = testHub(t, "[]")
 	cstest.RequireErrorContains(t, err, "invalid hub index: failed to parse index: json: cannot unmarshal array into Go value of type cwhub.HubItems")
 	assert.NotNil(t, hub)
 	assert.Empty(t, hub.Warnings)
 }
 
 func TestIndexUnknownItemType(t *testing.T) {
 	// Allow unknown fields in the top level object, likely new item types
-	hub, err := testHub(t, nil, `{"goodies": {}}`)
+	hub, err := testHub(t, `{"goodies": {}}`)
 	require.NoError(t, err)
 	assert.Empty(t, hub.Warnings)
 }
 
 func TestHubUpdate(t *testing.T) {
 	ctx := t.Context()
 	// update an empty hub with a index containing a parser.
-	hub, err := testHub(t, nil, "{}")
+	hub, err := testHub(t, "{}")
 	require.NoError(t, err)
 
 	index1 := `
@@ -149,7 +147,7 @@ func TestHubUpdate(t *testing.T) {
 
 func TestHubUpdateInvalidTemplate(t *testing.T) {
 	ctx := t.Context()
-	hub, err := testHub(t, nil, "{}")
+	hub, err := testHub(t, "{}")
 	require.NoError(t, err)
 
 	downloader := &Downloader{
@@ -164,7 +162,7 @@ func TestHubUpdateInvalidTemplate(t *testing.T) {
 
 func TestHubUpdateCannotWrite(t *testing.T) {
 	ctx := t.Context()
-	hub, err := testHub(t, nil, "{}")
+	hub, err := testHub(t, "{}")
 	require.NoError(t, err)
 
 	index1 := `
@@ -225,7 +223,7 @@ func TestHubUpdateAfterLoad(t *testing.T) {
     }
   }
 }`
-	hub, err := testHub(t, nil, index1)
+	hub, err := testHub(t, index1)
 	require.NoError(t, err)
 
 	index2 := `

pkg/database/alertfilter.go

@@ -26,7 +26,7 @@ func handleSimulatedFilter(filter map[string][]string, predicates *[]predicate.A
 	}
 }
 
-func handleOriginFilter(filter map[string][]string, predicates *[]predicate.Alert) {
+func handleOriginFilter(filter map[string][]string) {
 	if _, ok := filter["origin"]; ok {
 		filter["include_capi"] = []string{"true"}
 	}
@@ -193,7 +193,7 @@ func alertPredicatesFromFilter(filter map[string][]string) ([]predicate.Alert, e
 	// else, return bans that are *contained* by the given value (value is the outer)
 
 	handleSimulatedFilter(filter, &predicates)
-	handleOriginFilter(filter, &predicates)
+	handleOriginFilter(filter)
 
 	for param, value := range filter {
 		switch param {

pkg/exprhelpers/debugger.go

@@ -180,6 +180,7 @@ var opHandlers = map[string]opHandler{
 func opBegin(out OpOutput, _ *OpOutput, _ int, _ []string, _ *vm.VM, _ *vm.Program) *OpOutput {
 	out.CodeDepth += IndentStep
 	out.BlockStart = true
+
 	return &out
 }
 
@@ -340,30 +341,30 @@ func opIn(out OpOutput, _ *OpOutput, _ int, _ []string, vm *vm.VM, _ *vm.Program
 	stack := vm.Stack
 	out.Condition = true
 	out.ConditionIn = true
-	//seems that we tend to receive stack[1] as a map.
-	//it is tempting to use reflect to extract keys, but we end up with an array that doesn't match the initial order
-	//(because of the random order of the map)
+	// it seems that we tend to receive stack[1] as a map.
+	// it is tempting to use reflect to extract keys, but we end up with an array that doesn't match the initial order
+	// (because of the random order of the map)
 	out.Args = append(out.Args, autoQuote(stack[0]))
 	out.Args = append(out.Args, autoQuote(stack[1]))
 
 	return &out
 }
 
 func opContains(out OpOutput, _ *OpOutput, _ int, _ []string, vm *vm.VM, _ *vm.Program) *OpOutput {
-	// kind OpIn , but reverse
+	// kind of OpIn, but reverse
 	stack := vm.Stack
 	out.Condition = true
 	out.ConditionContains = true
-	//seems that we tend to receive stack[1] as a map.
-	//it is tempting to use reflect to extract keys, but we end up with an array that doesn't match the initial order
-	//(because of the random order of the map)
+	// it seems that we tend to receive stack[1] as a map.
+	// it is tempting to use reflect to extract keys, but we end up with an array that doesn't match the initial order
+	// (because of the random order of the map)
 	out.Args = append(out.Args, autoQuote(stack[0]))
 	out.Args = append(out.Args, autoQuote(stack[1]))
 
 	return &out
 }
 
-func (erp ExprRuntimeDebug) ipDebug(ip int, vm *vm.VM, program *vm.Program, parts []string, outputs []OpOutput) ([]OpOutput, error) {
+func (erp ExprRuntimeDebug) ipDebug(ip int, vm *vm.VM, program *vm.Program, parts []string, outputs []OpOutput) []OpOutput {
 	IdxOut := len(outputs)
 	prevIdxOut := 0
 	currentDepth := 0
@@ -418,7 +419,7 @@ func (erp ExprRuntimeDebug) ipDebug(ip int, vm *vm.VM, program *vm.Program, part
 		}
 	}
 
-	return outputs, nil
+	return outputs
 }
 
 func (erp ExprRuntimeDebug) ipSeek(ip int) []string {
@@ -475,18 +476,14 @@ func RunWithDebug(program *vm.Program, env any, logger *log.Entry) ([]OpOutput,
 
 	go func() {
 		// We must never return until the execution of the program is done
-		var err error
-
 		erp.Logger.Tracef("[START] ip 0")
 
 		ops := erp.ipSeek(0)
 		if ops == nil {
 			log.Warningf("error while debugging expr: failed getting ops for ip 0")
 		}
 
-		if outputs, err = erp.ipDebug(0, vm, program, ops, outputs); err != nil {
-			log.Warningf("error while debugging expr: error while debugging at ip 0")
-		}
+		outputs = erp.ipDebug(0, vm, program, ops, outputs)
 
 		vm.Step()
 
@@ -497,9 +494,7 @@ func RunWithDebug(program *vm.Program, env any, logger *log.Entry) ([]OpOutput,
 				break
 			}
 
-			if outputs, err = erp.ipDebug(ip, vm, program, ops, outputs); err != nil {
-				log.Warningf("error while debugging expr: error while debugging at ip %d", ip)
-			}
+			outputs = erp.ipDebug(ip, vm, program, ops, outputs)
 
 			vm.Step()
 		}

pkg/hubops/datarefresh.go

@@ -35,7 +35,7 @@ func NewDataRefreshCommand(force bool) *DataRefreshCommand {
 	return &DataRefreshCommand{Force: force}
 }
 
-func (*DataRefreshCommand) Prepare(plan *ActionPlan) (bool, error) {
+func (*DataRefreshCommand) Prepare(_ *ActionPlan) (bool, error) {
 	// we can't prepare much at this point because we don't know which data files yet,
 	// and items needs to be downloaded/updated
 	// evertyhing will be done in Run()

pkg/hubops/disable.go

@@ -85,10 +85,10 @@ func (c *DisableCommand) Prepare(plan *ActionPlan) (bool, error) {
 	return true, nil
 }
 
-func (c *DisableCommand) Run(ctx context.Context, plan *ActionPlan) error {
+func (c *DisableCommand) Run(_ context.Context, plan *ActionPlan) error {
 	i := c.Item
 
-	fmt.Println("disabling " + colorizeItemName(i.FQName()))
+	fmt.Fprintln(os.Stdout, "disabling " + colorizeItemName(i.FQName()))
 
 	if err := RemoveInstallLink(i); err != nil {
 		return fmt.Errorf("while disabling %s: %w", i.FQName(), err)

pkg/hubops/enable.go

@@ -77,10 +77,10 @@ func CreateInstallLink(i *cwhub.Item) error {
 	return nil
 }
 
-func (c *EnableCommand) Run(ctx context.Context, plan *ActionPlan) error {
+func (c *EnableCommand) Run(_ context.Context, plan *ActionPlan) error {
 	i := c.Item
 
-	fmt.Println("enabling " + colorizeItemName(i.FQName()))
+	fmt.Fprintln(os.Stdout, "enabling " + colorizeItemName(i.FQName()))
 
 	if !i.State.IsDownloaded() {
 		// XXX: this a warning?

pkg/hubops/purge.go

@@ -50,10 +50,10 @@ func (c *PurgeCommand) Prepare(plan *ActionPlan) (bool, error) {
 	return true, nil
 }
 
-func (c *PurgeCommand) Run(ctx context.Context, plan *ActionPlan) error {
+func (c *PurgeCommand) Run(_ context.Context, _ *ActionPlan) error {
 	i := c.Item
 
-	fmt.Println("purging " + colorizeItemName(i.FQName()))
+	fmt.Fprintln(os.Stdout, "purging " + colorizeItemName(i.FQName()))
 
 	if err := os.Remove(i.State.DownloadPath); err != nil {
 		if os.IsNotExist(err) {