From 364b833d679849c7cd9917973439e1f8e128442a Mon Sep 17 00:00:00 2001 From: mmetc <92726601+mmetc@users.noreply.github.com> Date: Thu, 25 May 2023 15:32:32 +0200 Subject: [PATCH] test cleanup: remove /tmp/crowdsec_tests* directories (#2232) --- pkg/apiserver/alerts_test.go | 10 +++++----- pkg/apiserver/api_key_test.go | 2 +- pkg/apiserver/apic_test.go | 4 ++-- pkg/apiserver/apiserver_test.go | 35 ++++++++++++++++++++++----------- pkg/apiserver/jwt_test.go | 2 +- pkg/apiserver/machines_test.go | 10 +++++----- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/pkg/apiserver/alerts_test.go b/pkg/apiserver/alerts_test.go index f6388fc1e..5fd23d116 100644 --- a/pkg/apiserver/alerts_test.go +++ b/pkg/apiserver/alerts_test.go @@ -28,7 +28,7 @@ type LAPI struct { func SetupLAPITest(t *testing.T) LAPI { t.Helper() - router, loginResp, config, err := InitMachineTest() + router, loginResp, config, err := InitMachineTest(t) if err != nil { t.Fatal(err) } @@ -68,8 +68,8 @@ func (l *LAPI) RecordResponse(verb string, url string, body *strings.Reader, aut return w } -func InitMachineTest() (*gin.Engine, models.WatcherAuthResponse, csconfig.Config, error) { - router, config, err := NewAPITest() +func InitMachineTest(t *testing.T) (*gin.Engine, models.WatcherAuthResponse, csconfig.Config, error) { + router, config, err := NewAPITest(t) if err != nil { return nil, models.WatcherAuthResponse{}, config, fmt.Errorf("unable to run local API: %s", err) } @@ -151,7 +151,7 @@ func TestCreateAlert(t *testing.T) { func TestCreateAlertChannels(t *testing.T) { - apiServer, config, err := NewAPIServer() + apiServer, config, err := NewAPIServer(t) if err != nil { log.Fatalln(err) } @@ -443,7 +443,7 @@ func TestDeleteAlertByID(t *testing.T) { } func TestDeleteAlertTrustedIPS(t *testing.T) { - cfg := LoadTestConfig() + cfg := LoadTestConfig(t) // IPv6 mocking doesn't seem to work. // cfg.API.Server.TrustedIPs = []string{"1.2.3.4", "1.2.4.0/24", "::"} cfg.API.Server.TrustedIPs = []string{"1.2.3.4", "1.2.4.0/24"} diff --git a/pkg/apiserver/api_key_test.go b/pkg/apiserver/api_key_test.go index d1db144af..a77ab3f83 100644 --- a/pkg/apiserver/api_key_test.go +++ b/pkg/apiserver/api_key_test.go @@ -11,7 +11,7 @@ import ( ) func TestAPIKey(t *testing.T) { - router, config, err := NewAPITest() + router, config, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } diff --git a/pkg/apiserver/apic_test.go b/pkg/apiserver/apic_test.go index dd89e2be5..6cd0e5f33 100644 --- a/pkg/apiserver/apic_test.go +++ b/pkg/apiserver/apic_test.go @@ -206,7 +206,7 @@ func TestNewAPIC(t *testing.T) { action: func() {}, args: args{ dbClient: getDBClient(t), - consoleConfig: LoadTestConfig().API.Server.ConsoleConfig, + consoleConfig: LoadTestConfig(t).API.Server.ConsoleConfig, }, }, { @@ -214,7 +214,7 @@ func TestNewAPIC(t *testing.T) { action: func() { testConfig.Credentials.URL = "foobar http://" }, args: args{ dbClient: getDBClient(t), - consoleConfig: LoadTestConfig().API.Server.ConsoleConfig, + consoleConfig: LoadTestConfig(t).API.Server.ConsoleConfig, }, expectedErr: "first path segment in URL cannot contain colon", }, diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index 136b0d919..464c93f83 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -37,13 +37,16 @@ var MachineTest = models.WatcherAuthRequest{ var UserAgent = fmt.Sprintf("crowdsec-test/%s", version.Version) var emptyBody = strings.NewReader("") -func LoadTestConfig() csconfig.Config { +func LoadTestConfig(t *testing.T) csconfig.Config { config := csconfig.Config{} maxAge := "1h" flushConfig := csconfig.FlushDBCfg{ MaxAge: &maxAge, } + tempDir, _ := os.MkdirTemp("", "crowdsec_tests") + t.Cleanup(func() { os.RemoveAll(tempDir) }) + dbconfig := csconfig.DatabaseCfg{ Type: "sqlite", DbPath: filepath.Join(tempDir, "ent"), @@ -69,13 +72,16 @@ func LoadTestConfig() csconfig.Config { return config } -func LoadTestConfigForwardedFor() csconfig.Config { +func LoadTestConfigForwardedFor(t *testing.T) csconfig.Config { config := csconfig.Config{} maxAge := "1h" flushConfig := csconfig.FlushDBCfg{ MaxAge: &maxAge, } + tempDir, _ := os.MkdirTemp("", "crowdsec_tests") + t.Cleanup(func() { os.RemoveAll(tempDir) }) + dbconfig := csconfig.DatabaseCfg{ Type: "sqlite", DbPath: filepath.Join(tempDir, "ent"), @@ -103,8 +109,8 @@ func LoadTestConfigForwardedFor() csconfig.Config { return config } -func NewAPIServer() (*APIServer, csconfig.Config, error) { - config := LoadTestConfig() +func NewAPIServer(t *testing.T) (*APIServer, csconfig.Config, error) { + config := LoadTestConfig(t) os.Remove("./ent") apiServer, err := NewServer(config.API.Server) if err != nil { @@ -115,8 +121,8 @@ func NewAPIServer() (*APIServer, csconfig.Config, error) { return apiServer, config, nil } -func NewAPITest() (*gin.Engine, csconfig.Config, error) { - apiServer, config, err := NewAPIServer() +func NewAPITest(t *testing.T) (*gin.Engine, csconfig.Config, error) { + apiServer, config, err := NewAPIServer(t) if err != nil { return nil, config, fmt.Errorf("unable to run local API: %s", err) } @@ -131,8 +137,8 @@ func NewAPITest() (*gin.Engine, csconfig.Config, error) { return router, config, nil } -func NewAPITestForwardedFor() (*gin.Engine, csconfig.Config, error) { - config := LoadTestConfigForwardedFor() +func NewAPITestForwardedFor(t *testing.T) (*gin.Engine, csconfig.Config, error) { + config := LoadTestConfigForwardedFor(t) os.Remove("./ent") apiServer, err := NewServer(config.API.Server) @@ -285,7 +291,7 @@ func CreateTestBouncer(config *csconfig.DatabaseCfg) (string, error) { } func TestWithWrongDBConfig(t *testing.T) { - config := LoadTestConfig() + config := LoadTestConfig(t) config.API.Server.DbConfig.Type = "test" apiServer, err := NewServer(config.API.Server) @@ -294,7 +300,7 @@ func TestWithWrongDBConfig(t *testing.T) { } func TestWithWrongFlushConfig(t *testing.T) { - config := LoadTestConfig() + config := LoadTestConfig(t) maxItems := -1 config.API.Server.DbConfig.Flush.MaxItems = &maxItems apiServer, err := NewServer(config.API.Server) @@ -304,7 +310,7 @@ func TestWithWrongFlushConfig(t *testing.T) { } func TestUnknownPath(t *testing.T) { - router, _, err := NewAPITest() + router, _, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } @@ -334,13 +340,15 @@ ListenURI string `yaml:"listen_uri,omitempty"` //127.0 */ func TestLoggingDebugToFileConfig(t *testing.T) { - /*declare settings*/ maxAge := "1h" flushConfig := csconfig.FlushDBCfg{ MaxAge: &maxAge, } + tempDir, _ := os.MkdirTemp("", "crowdsec_tests") + t.Cleanup(func() { os.RemoveAll(tempDir) }) + dbconfig := csconfig.DatabaseCfg{ Type: "sqlite", DbPath: filepath.Join(tempDir, "ent"), @@ -398,7 +406,10 @@ func TestLoggingErrorToFileConfig(t *testing.T) { flushConfig := csconfig.FlushDBCfg{ MaxAge: &maxAge, } + tempDir, _ := os.MkdirTemp("", "crowdsec_tests") + t.Cleanup(func() { os.RemoveAll(tempDir) }) + dbconfig := csconfig.DatabaseCfg{ Type: "sqlite", DbPath: filepath.Join(tempDir, "ent"), diff --git a/pkg/apiserver/jwt_test.go b/pkg/apiserver/jwt_test.go index ece32c1b8..ebca91252 100644 --- a/pkg/apiserver/jwt_test.go +++ b/pkg/apiserver/jwt_test.go @@ -11,7 +11,7 @@ import ( ) func TestLogin(t *testing.T) { - router, config, err := NewAPITest() + router, config, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } diff --git a/pkg/apiserver/machines_test.go b/pkg/apiserver/machines_test.go index 373cd42a4..25fd0eaf4 100644 --- a/pkg/apiserver/machines_test.go +++ b/pkg/apiserver/machines_test.go @@ -12,7 +12,7 @@ import ( ) func TestCreateMachine(t *testing.T) { - router, _, err := NewAPITest() + router, _, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } @@ -53,7 +53,7 @@ func TestCreateMachine(t *testing.T) { } func TestCreateMachineWithForwardedFor(t *testing.T) { - router, config, err := NewAPITestForwardedFor() + router, config, err := NewAPITestForwardedFor(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } @@ -82,7 +82,7 @@ func TestCreateMachineWithForwardedFor(t *testing.T) { } func TestCreateMachineWithForwardedForNoConfig(t *testing.T) { - router, config, err := NewAPITest() + router, config, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } @@ -113,7 +113,7 @@ func TestCreateMachineWithForwardedForNoConfig(t *testing.T) { } func TestCreateMachineWithoutForwardedFor(t *testing.T) { - router, config, err := NewAPITestForwardedFor() + router, config, err := NewAPITestForwardedFor(t) if err != nil { log.Fatalf("unable to run local API: %s", err) } @@ -143,7 +143,7 @@ func TestCreateMachineWithoutForwardedFor(t *testing.T) { } func TestCreateMachineAlreadyExist(t *testing.T) { - router, _, err := NewAPITest() + router, _, err := NewAPITest(t) if err != nil { log.Fatalf("unable to run local API: %s", err) }