context propagation: ValidateMachine()

crowdsecurity · Oct 3, 2024 · 5ec02ae · 5ec02ae
1 parent c01daa4
commit 5ec02ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/pkg/apiserver/alerts_test.go b/pkg/apiserver/alerts_test.go
@@ -73,7 +73,7 @@ func InitMachineTest(t *testing.T, ctx context.Context) (*gin.Engine, models.Wat
 
 func LoginToTestAPI(t *testing.T, ctx context.Context, router *gin.Engine, config csconfig.Config) models.WatcherAuthResponse {
 	body := CreateTestMachine(t, ctx, router, "")
-	ValidateMachine(t, "test", config.API.Server.DbConfig)
+	ValidateMachine(t, ctx, "test", config.API.Server.DbConfig)
 
 	w := httptest.NewRecorder()
 	req, _ := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))

diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go
@@ -181,9 +181,7 @@ func NewAPITestForwardedFor(t *testing.T, ctx context.Context) (*gin.Engine, csc
 	return router, config
 }
 
-func ValidateMachine(t *testing.T, machineID string, config *csconfig.DatabaseCfg) {
-	ctx := context.TODO()
-
+func ValidateMachine(t *testing.T, ctx context.Context, machineID string, config *csconfig.DatabaseCfg) {
 	dbClient, err := database.NewClient(ctx, config)
 	require.NoError(t, err)
 

diff --git a/pkg/apiserver/jwt_test.go b/pkg/apiserver/jwt_test.go
@@ -53,7 +53,7 @@ func TestLogin(t *testing.T) {
 	assert.Equal(t, `{"code":401,"message":"validation failure list:\npassword in body is required"}`, w.Body.String())
 
 	// Validate machine
-	ValidateMachine(t, "test", config.API.Server.DbConfig)
+	ValidateMachine(t, ctx, "test", config.API.Server.DbConfig)
 
 	// Login with invalid password
 	w = httptest.NewRecorder()