From 927310a4395c0840db3e23f01d06b4dce9d1a81d Mon Sep 17 00:00:00 2001
From: Sebastien Blot <sebastien@crowdsec.net>
Date: Wed, 8 Nov 2023 20:37:05 +0100
Subject: [PATCH] up

---
 pkg/acquisition/modules/waap/waap.go | 29 ++++++++++++----------------
 pkg/waf/waap.go                      |  3 ++-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkg/acquisition/modules/waap/waap.go b/pkg/acquisition/modules/waap/waap.go
index 4fbacfeb5..9561d8959 100644
--- a/pkg/acquisition/modules/waap/waap.go
+++ b/pkg/acquisition/modules/waap/waap.go
@@ -129,33 +129,28 @@ func (w *WaapSource) Configure(yamlConfig []byte, logger *log.Entry) error {
 	}
 
 	w.InChan = make(chan waf.ParsedRequest)
+	waapCfg := waf.WaapConfig{Logger: w.logger.WithField("component", "waap_config")}
 
 	//let's load the associated waap_config:
 	if w.config.WaapConfigPath != "" {
-		waapCfg := waf.WaapConfig{Logger: w.logger.WithField("component", "waap_config")}
-		if w.config.WaapConfigPath != "" {
-			err := waapCfg.LoadByPath(w.config.WaapConfigPath)
-			if err != nil {
-				return fmt.Errorf("unable to load waap_config : %s", err)
-			}
-		} else if w.config.WaapConfig != "" {
-			err := waapCfg.Load(w.config.WaapConfig)
-			if err != nil {
-				return fmt.Errorf("unable to load waap_config : %s", err)
-			}
-		} else {
-			return fmt.Errorf("no waap_config provided")
-		}
-		w.WaapRuntime, err = waapCfg.Build()
+		err := waapCfg.LoadByPath(w.config.WaapConfigPath)
 		if err != nil {
-			return fmt.Errorf("unable to build waap_config : %s", err)
+			return fmt.Errorf("unable to load waap_config : %s", err)
 		}
 	} else if w.config.WaapConfig != "" {
-		return fmt.Errorf("resolution of waap_config not implemented yet")
+		err := waapCfg.Load(w.config.WaapConfig)
+		if err != nil {
+			return fmt.Errorf("unable to load waap_config : %s", err)
+		}
 	} else {
 		return fmt.Errorf("no waap_config provided")
 	}
 
+	w.WaapRuntime, err = waapCfg.Build()
+	if err != nil {
+		return fmt.Errorf("unable to build waap_config : %s", err)
+	}
+
 	err = w.WaapRuntime.ProcessOnLoadRules()
 
 	if err != nil {
diff --git a/pkg/waf/waap.go b/pkg/waf/waap.go
index 96b585e59..017e57ae2 100644
--- a/pkg/waf/waap.go
+++ b/pkg/waf/waap.go
@@ -168,9 +168,10 @@ func (wc *WaapConfig) Load(configName string) error {
 		if err != nil {
 			return fmt.Errorf("unable to load waap-config %s : %s", hubWaapConfigItem.LocalPath, err)
 		}
+		return nil
 	}
 
-	return nil
+	return fmt.Errorf("no waap-config found for %s", configName)
 }
 
 func (wc *WaapConfig) Build() (*WaapRuntimeConfig, error) {