lint: fix nilaway warnings (part 6) (#3864)

Author: mmetc

pkg/acquisition/modules/victorialogs/internal/vlclient/vl_client.go

@@ -49,8 +49,12 @@ type Config struct {
 	Limit int
 }
 
-func updateURI(uri string, newStart time.Time) string {
-	u, _ := url.Parse(uri)
+func updateURI(uri string, newStart time.Time) (string, error) {
+	u, err := url.Parse(uri)
+	if err != nil {
+		return "", fmt.Errorf("invalid VictoriaLogs URL %q: %w", uri, err)
+	}
+
 	queryParams := u.Query()
 
 	if !newStart.IsZero() {
@@ -61,7 +65,7 @@ func updateURI(uri string, newStart time.Time) string {
 
 	u.RawQuery = queryParams.Encode()
 
-	return u.String()
+	return u.String(), nil
 }
 
 func (lc *VLClient) SetTomb(t *tomb.Tomb) {
@@ -120,7 +124,7 @@ func (lc *VLClient) doQueryRange(ctx context.Context, uri string, c chan *Log, i
 			resp, err := lc.Get(ctx, uri)
 			if err != nil {
 				if ok := lc.shouldRetry(); !ok {
-					return fmt.Errorf("error querying range: %w", err)
+					return fmt.Errorf("querying range: %w", err)
 				}
 
 				lc.increaseTicker(ticker)
@@ -144,7 +148,7 @@ func (lc *VLClient) doQueryRange(ctx context.Context, uri string, c chan *Log, i
 
 			n, largestTime, err := lc.readResponse(ctx, resp, c)
 			if err != nil {
-				return err
+				return fmt.Errorf("querying range: %w", err)
 			}
 
 			if !infinite && n < lc.config.Limit {
@@ -165,7 +169,10 @@ func (lc *VLClient) doQueryRange(ctx context.Context, uri string, c chan *Log, i
 				}
 			}
 
-			uri = updateURI(uri, largestTime)
+			uri, err = updateURI(uri, largestTime)
+			if err != nil {
+				return fmt.Errorf("querying range: %w", err)
+			}
 		}
 	}
 }
@@ -177,13 +184,13 @@ func (lc *VLClient) readResponse(ctx context.Context, resp *http.Response, c cha
 	var (
 		finishedReading bool
 		n               int
-		latestTs        time.Time
+		latestTS        time.Time
 	)
 
 	for !finishedReading {
 		select {
 		case <-ctx.Done():
-			return n, latestTs, nil
+			return n, latestTS, nil
 		default:
 		}
 
@@ -198,9 +205,9 @@ func (lc *VLClient) readResponse(ctx context.Context, resp *http.Response, c cha
 				// b can be != nil when EOF is returned, so we need to process it
 				finishedReading = true
 			} else if errors.Is(err, context.Canceled) {
-				return n, latestTs, nil
+				return n, latestTS, nil
 			} else {
-				return n, latestTs, fmt.Errorf("cannot read line in response: %w", err)
+				return n, latestTS, fmt.Errorf("cannot read line in response: %w", err)
 			}
 		}
 
@@ -222,12 +229,12 @@ func (lc *VLClient) readResponse(ctx context.Context, resp *http.Response, c cha
 		lc.Logger.Tracef("Got response: %+v", logLine)
 		c <- &logLine
 
-		if logLine.Time.After(latestTs) {
-			latestTs = logLine.Time
+		if logLine.Time.After(latestTS) {
+			latestTS = logLine.Time
 		}
 	}
 
-	return n, latestTs, nil
+	return n, latestTS, nil
 }
 
 func (lc *VLClient) getURLFor(endpoint string, params map[string]string) string {

pkg/acquisition/modules/victorialogs/victorialogs_test.go

@@ -16,6 +16,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"gopkg.in/tomb.v2"
 
 	"github.com/crowdsecurity/go-cs-lib/cstest"
@@ -212,10 +213,10 @@ func TestConfigureDSN(t *testing.T) {
 		}
 
 		if test.scheme != "" {
-			url, _ := url.Parse(vlSource.Config.URL)
-			if test.scheme != url.Scheme {
-				t.Fatalf("Schema mismatch : %s != %s", test.scheme, url.Scheme)
-			}
+			url, err := url.Parse(vlSource.Config.URL)
+			require.NoError(t, err)
+			require.NotNil(t, url)
+			require.Equal(t, test.scheme, url.Scheme)
 		}
 
 		if test.waitForReady != 0 {

pkg/csplugin/broker.go

@@ -377,12 +377,22 @@ func (pb *PluginBroker) loadNotificationPlugin(ctx context.Context, name string,
 }
 
 func (pb *PluginBroker) tryNotify(ctx context.Context, pluginName, message string) error {
-	timeout := pb.pluginConfigByName[pluginName].TimeOut
+	// config guard
+	pc, ok := pb.pluginConfigByName[pluginName]
+	if !ok {
+		return fmt.Errorf("plugin %q: config not found", pluginName)
+	}
+
+	timeout := pc.TimeOut
 	ctxTimeout, cancel := context.WithTimeout(ctx, timeout)
 
 	defer cancel()
 
-	plugin := pb.notificationPluginByName[pluginName]
+	// plugin guard
+	plugin, ok := pb.notificationPluginByName[pluginName]
+	if !ok || plugin == nil {
+		return fmt.Errorf("plugin %q: notifier not registered", pluginName)
+	}
 
 	_, err := plugin.Notify(
 		ctxTimeout,

pkg/hubtest/helpers.go

@@ -1,10 +1,22 @@
 package hubtest
 
 import (
+	"errors"
+	"fmt"
 	"path/filepath"
 )
 
 func basename(params ...any) (any, error) {
-	s := params[0].(string)
+	// keep nilaway happy
+	if len(params) == 0 || params[0] == nil {
+		return "", errors.New("basename: missing argument")
+	}
+
+	// keep forcetypeassert happy
+	s, ok := params[0].(string)
+	if !ok {
+		return "", fmt.Errorf("basename: want string, got %T", params[0])
+	}
+
 	return filepath.Base(s), nil
 }