wip2

Author: mmetc

pkg/acquisition/acquisition.go

@@ -26,7 +26,6 @@ import (
 	"github.com/crowdsecurity/go-cs-lib/trace"
 
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"
-	"github.com/crowdsecurity/crowdsec/pkg/apiclient"
 	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 	"github.com/crowdsecurity/crowdsec/pkg/cwversion/component"
@@ -118,7 +117,6 @@ type DSNConfigurer interface {
 }
 
 type LAPIClientAware interface {
-	SetClient(client *apiclient.ApiClient)
 	SetClientConfig(config *csconfig.LocalApiClientCfg)
 }
 
@@ -193,15 +191,7 @@ func DataSourceConfigure(ctx context.Context, commonConfig configuration.DataSou
 	}
 
 	if lapiClientAware, ok := dataSrc.(LAPIClientAware); ok {
-		apiClient, err := apiclient.GetLAPIClient()
-		if err != nil {
-			return nil, fmt.Errorf("unable to get authenticated LAPI client: %w", err)
-		}
-
-		lapiClientAware.SetClient(apiClient)
-
 		cConfig := csconfig.GetConfig()
-
 		lapiClientAware.SetClientConfig(cConfig.API.Client)
 	}
 
@@ -240,15 +230,7 @@ func LoadAcquisitionFromDSN(ctx context.Context, dsn string, labels map[string]s
 	}
 
 	if lapiClientAware, ok := dataSrc.(LAPIClientAware); ok {
-		apiClient, err := apiclient.GetLAPIClient()
-		if err != nil {
-			return nil, fmt.Errorf("unable to get authenticated LAPI client: %w", err)
-		}
-
-		lapiClientAware.SetClient(apiClient)
-
 		cConfig := csconfig.GetConfig()
-
 		lapiClientAware.SetClientConfig(cConfig.API.Client)
 	}
 

pkg/acquisition/modules/appsec/config.go

@@ -17,6 +17,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"
+	"github.com/crowdsecurity/crowdsec/pkg/apiclient"
 	"github.com/crowdsecurity/crowdsec/pkg/apiclient/useragent"
 	"github.com/crowdsecurity/crowdsec/pkg/appsec"
 	"github.com/crowdsecurity/crowdsec/pkg/appsec/allowlists"
@@ -120,16 +121,18 @@ func (w *Source) Configure(_ context.Context, yamlConfig []byte, logger *log.Ent
 		return errors.New("appsec datasource requires a hub. this is a bug, please report")
 	}
 
-	if w.lapiClient == nil {
-		return errors.New("appsec datasource requires a lapi client. this is a bug, please report")
-	}
-
 	if w.lapiClientConfig == nil {
 		return errors.New("appsec datasource requires a lapi client configuration. this is a bug, please report")
 	}
 
-	err := w.UnmarshalConfig(yamlConfig)
+	client, err := apiclient.GetLAPIClient()
 	if err != nil {
+		return fmt.Errorf("unable to get authenticated LAPI client: %w", err)
+	}
+
+	w.lapiClient = client
+
+	if err := w.UnmarshalConfig(yamlConfig); err != nil {
 		return fmt.Errorf("unable to parse appsec configuration: %w", err)
 	}
 

pkg/acquisition/modules/appsec/source.go

@@ -67,10 +67,6 @@ func (ac *AuthCache) Delete(apiKey string) {
 	ac.mu.Unlock()
 }
 
-func (w *Source) SetClient(client *apiclient.ApiClient) {
-	w.lapiClient = client
-}
-
 func (w *Source) SetClientConfig(config *csconfig.LocalApiClientCfg) {
 	w.lapiClientConfig = config
 }