leakybucket: reduce error verbosity, test for misconfiguration (#4087)

Author: mmetc

cmd/crowdsec/main.go

@@ -65,7 +65,7 @@ func LoadBuckets(cConfig *csconfig.Config, hub *cwhub.Hub) error {
 
 	holders, outputEventChan, err = leakybucket.LoadBuckets(cConfig.Crowdsec, hub, scenarios, buckets, flags.OrderEvent)
 	if err != nil {
-		return fmt.Errorf("scenario loading failed: %w", err)
+		return err
 	}
 
 	if cConfig.Prometheus != nil && cConfig.Prometheus.Enabled {

pkg/leakybucket/manager_load.go

@@ -299,8 +299,7 @@ func loadBucketFactoriesFromFile(item *cwhub.Item, hub *cwhub.Hub, buckets *Buck
 
 		err = LoadBucket(&bucketFactory)
 		if err != nil {
-			log.Errorf("Failed to load bucket %s: %v", bucketFactory.Name, err)
-			return nil, fmt.Errorf("loading of %s failed: %w", bucketFactory.Name, err)
+			return nil, fmt.Errorf("bucket %s: %w", bucketFactory.Name, err)
 		}
 
 		bucketFactory.orderEvent = orderEvent
@@ -370,7 +369,7 @@ func LoadBucket(bucketFactory *BucketFactory) error {
 
 	if bucketFactory.Filter == "" {
 		bucketFactory.logger.Warning("Bucket without filter, abort.")
-		return errors.New("bucket without filter directive")
+		return errors.New("missing filter directive")
 	}
 
 	bucketFactory.RunTimeFilter, err = expr.Compile(bucketFactory.Filter, exprhelpers.GetExprOptions(map[string]any{"evt": &pipeline.Event{}})...)

test/bats/scenarios.bats

@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+
+set -u
+
+setup_file() {
+    load "../lib/setup_file.sh"
+}
+
+teardown_file() {
+    load "../lib/teardown_file.sh"
+}
+
+setup() {
+    load "../lib/setup.sh"
+    ./instance-data load
+}
+
+teardown() {
+    ./instance-crowdsec stop
+}
+
+#----------
+
+@test "misconfigured scenario" {
+    CONFIG_DIR=$(dirname "$CONFIG_YAML")
+    mkdir -p "$CONFIG_DIR/scenarios/local"
+    echo "name: foo" >"$CONFIG_DIR/scenarios/local/foo.yaml"
+    config_set '.common.log_media="stdout"'
+    rune -1 "$CROWDSEC"
+    # XXX:
+    assert_stderr --partial "Bucket without filter, abort."
+    assert_stderr --partial "crowdsec init: while loading scenarios: bucket foo: missing filter directive"
+    refute_output
+}