drop CTX from dbclient

mmetc · Sep 18, 2024 · b757a5b · b757a5b
1 parent 7cac084
commit b757a5b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/pkg/apiserver/apic.go b/pkg/apiserver/apic.go
@@ -406,13 +406,13 @@ func (a *apic) Send(cacheOrig *models.AddSignalsRequest) {
 	}
 }
 
-func (a *apic) CAPIPullIsOld() (bool, error) {
+func (a *apic) CAPIPullIsOld(ctx context.Context) (bool, error) {
 	/*only pull community blocklist if it's older than 1h30 */
 	alerts := a.dbClient.Ent.Alert.Query()
 	alerts = alerts.Where(alert.HasDecisionsWith(decision.OriginEQ(database.CapiMachineID)))
 	alerts = alerts.Where(alert.CreatedAtGTE(time.Now().UTC().Add(-time.Duration(1*time.Hour + 30*time.Minute)))) //nolint:unconvert
 
-	count, err := alerts.Count(a.dbClient.CTX)
+	count, err := alerts.Count(ctx)
 	if err != nil {
 		return false, fmt.Errorf("while looking for CAPI alert: %w", err)
 	}
@@ -634,7 +634,7 @@ func (a *apic) PullTop(ctx context.Context, forcePull bool) error {
 	}
 
 	if !forcePull {
-		if lastPullIsOld, err := a.CAPIPullIsOld(); err != nil {
+		if lastPullIsOld, err := a.CAPIPullIsOld(ctx); err != nil {
 			return err
 		} else if !lastPullIsOld {
 			return nil

diff --git a/pkg/apiserver/apic_test.go b/pkg/apiserver/apic_test.go
@@ -113,7 +113,9 @@ func assertTotalAlertCount(t *testing.T, dbClient *database.Client, count int) {
 func TestAPICCAPIPullIsOld(t *testing.T) {
 	api := getAPIC(t)
 
-	isOld, err := api.CAPIPullIsOld()
+	ctx := context.Background()
+
+	isOld, err := api.CAPIPullIsOld(ctx)
 	require.NoError(t, err)
 	assert.True(t, isOld)
 
@@ -124,17 +126,17 @@ func TestAPICCAPIPullIsOld(t *testing.T) {
 		SetScope("Country").
 		SetValue("Blah").
 		SetOrigin(types.CAPIOrigin).
-		SaveX(context.Background())
+		SaveX(ctx)
 
 	api.dbClient.Ent.Alert.Create().
 		SetCreatedAt(time.Now()).
 		SetScenario("crowdsec/test").
 		AddDecisions(
 			decision,
 		).
-		SaveX(context.Background())
+		SaveX(ctx)
 
-	isOld, err = api.CAPIPullIsOld()
+	isOld, err = api.CAPIPullIsOld(ctx)
 	require.NoError(t, err)
 
 	assert.False(t, isOld)

diff --git a/pkg/apiserver/middlewares/v1/jwt.go b/pkg/apiserver/middlewares/v1/jwt.go
@@ -129,6 +129,8 @@ func (j *JWT) authPlain(c *gin.Context) (*authInput, error) {
 		err        error
 	)
 
+	ctx := c.Request.Context()
+
 	ret := authInput{}
 
 	if err = c.ShouldBindJSON(&loginInput); err != nil {
@@ -145,7 +147,7 @@ func (j *JWT) authPlain(c *gin.Context) (*authInput, error) {
 
 	ret.clientMachine, err = j.DbClient.Ent.Machine.Query().
 		Where(machine.MachineId(ret.machineID)).
-		First(j.DbClient.CTX)
+		First(ctx)
 	if err != nil {
 		log.Infof("Error machine login for %s : %+v ", ret.machineID, err)
 		return nil, err

diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -21,7 +21,6 @@ import (
 
 type Client struct {
 	Ent              *ent.Client
-	CTX              context.Context
 	Log              *log.Logger
 	CanFlush         bool
 	Type             string
@@ -106,7 +105,6 @@ func NewClient(ctx context.Context, config *csconfig.DatabaseCfg) (*Client, erro
 
 	return &Client{
 		Ent:              client,
-		CTX:              ctx,
 		Log:              clog,
 		CanFlush:         true,
 		Type:             config.Type,