context propagation: pass ctx to UpdateScenario()

cmd/crowdsec-cli/clicapi/capi.go

@@ -170,7 +170,7 @@ func queryCAPIStatus(ctx context.Context, hub *cwhub.Hub, credURL string, login
 		// I don't believe papi is neede to check enrollement
 		// PapiURL:       papiURL,
 		VersionPrefix: "v3",
-		UpdateScenario: func() ([]string, error) {
+		UpdateScenario: func(_ context.Context) ([]string, error) {
 			return itemsForAPI, nil
 		},
 	})

cmd/crowdsec/lapiclient.go

@@ -36,7 +36,7 @@ func AuthenticatedLAPIClient(credentials csconfig.ApiCredentialsCfg, hub *cwhub.
 		URL:           apiURL,
 		PapiURL:       papiURL,
 		VersionPrefix: "v1",
-		UpdateScenario: func() ([]string, error) {
+		UpdateScenario: func(_ context.Context) ([]string, error) {
 			return itemsForAPI, nil
 		},
 	})

pkg/apiclient/auth_jwt.go

@@ -2,6 +2,7 @@ package apiclient
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -30,15 +31,17 @@ type JWTTransport struct {
 	// Transport is the underlying HTTP transport to use when making requests.
 	// It will default to http.DefaultTransport if nil.
 	Transport         http.RoundTripper
-	UpdateScenario    func() ([]string, error)
+	UpdateScenario    func(context.Context) ([]string, error)
 	refreshTokenMutex sync.Mutex
 }
 
 func (t *JWTTransport) refreshJwtToken() error {
 	var err error
 
+	ctx := context.TODO()
+
 	if t.UpdateScenario != nil {
-		t.Scenarios, err = t.UpdateScenario()
+		t.Scenarios, err = t.UpdateScenario(ctx)
 		if err != nil {
 			return fmt.Errorf("can't update scenario list: %w", err)
 		}

pkg/apiclient/config.go

@@ -1,6 +1,7 @@
 package apiclient
 
 import (
+	"context"
 	"net/url"
 
 	"github.com/go-openapi/strfmt"
@@ -15,5 +16,5 @@ type Config struct {
 	VersionPrefix     string
 	UserAgent         string
 	RegistrationToken string
-	UpdateScenario    func() ([]string, error)
+	UpdateScenario    func(context.Context) ([]string, error)
 }

pkg/apiserver/apic.go

@@ -82,11 +82,9 @@ func randomDuration(d time.Duration, delta time.Duration) time.Duration {
 	return ret
 }
 
-func (a *apic) FetchScenariosListFromDB() ([]string, error) {
+func (a *apic) FetchScenariosListFromDB(ctx context.Context) ([]string, error) {
 	scenarios := make([]string, 0)
 
-	ctx := context.TODO()
-
 	machines, err := a.dbClient.ListMachines(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("while listing machines: %w", err)
@@ -214,7 +212,7 @@ func NewAPIC(ctx context.Context, config *csconfig.OnlineApiClientCfg, dbClient
 		return nil, fmt.Errorf("while parsing '%s': %w", config.Credentials.PapiURL, err)
 	}
 
-	ret.scenarioList, err = ret.FetchScenariosListFromDB()
+	ret.scenarioList, err = ret.FetchScenariosListFromDB(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("while fetching scenarios from db: %w", err)
 	}
@@ -234,7 +232,7 @@ func NewAPIC(ctx context.Context, config *csconfig.OnlineApiClientCfg, dbClient
 
 	// The watcher will be authenticated by the RoundTripper the first time it will call CAPI
 	// Explicit authentication will provoke a useless supplementary call to CAPI
-	scenarios, err := ret.FetchScenariosListFromDB()
+	scenarios, err := ret.FetchScenariosListFromDB(ctx)
 	if err != nil {
 		return ret, fmt.Errorf("get scenario in db: %w", err)
 	}
@@ -944,7 +942,7 @@ func (a *apic) Pull(ctx context.Context) error {
 	toldOnce := false
 
 	for {
-		scenario, err := a.FetchScenariosListFromDB()
+		scenario, err := a.FetchScenariosListFromDB(ctx)
 		if err != nil {
 			log.Errorf("unable to fetch scenarios from db: %s", err)
 		}

pkg/apiserver/apic_test.go

@@ -143,6 +143,8 @@ func TestAPICCAPIPullIsOld(t *testing.T) {
 }
 
 func TestAPICFetchScenariosListFromDB(t *testing.T) {
+	ctx := context.Background()
+
 	tests := []struct {
 		name                    string
 		machineIDsWithScenarios map[string]string
@@ -174,10 +176,10 @@ func TestAPICFetchScenariosListFromDB(t *testing.T) {
 					SetPassword(testPassword.String()).
 					SetIpAddress("1.2.3.4").
 					SetScenarios(scenarios).
-					ExecX(context.Background())
+					ExecX(ctx)
 			}
 
-			scenarios, err := api.FetchScenariosListFromDB()
+			scenarios, err := api.FetchScenariosListFromDB(ctx)
 			require.NoError(t, err)
 
 			for machineID := range tc.machineIDsWithScenarios {