test cleanup: remove /tmp/crowdsec_tests* directories (#2232)
This commit is contained in:
parent
0416a41d58
commit
364b833d67
|
@ -28,7 +28,7 @@ type LAPI struct {
|
||||||
|
|
||||||
func SetupLAPITest(t *testing.T) LAPI {
|
func SetupLAPITest(t *testing.T) LAPI {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
router, loginResp, config, err := InitMachineTest()
|
router, loginResp, config, err := InitMachineTest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -68,8 +68,8 @@ func (l *LAPI) RecordResponse(verb string, url string, body *strings.Reader, aut
|
||||||
return w
|
return w
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitMachineTest() (*gin.Engine, models.WatcherAuthResponse, csconfig.Config, error) {
|
func InitMachineTest(t *testing.T) (*gin.Engine, models.WatcherAuthResponse, csconfig.Config, error) {
|
||||||
router, config, err := NewAPITest()
|
router, config, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, models.WatcherAuthResponse{}, config, fmt.Errorf("unable to run local API: %s", err)
|
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) {
|
func TestCreateAlertChannels(t *testing.T) {
|
||||||
|
|
||||||
apiServer, config, err := NewAPIServer()
|
apiServer, config, err := NewAPIServer(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
@ -443,7 +443,7 @@ func TestDeleteAlertByID(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDeleteAlertTrustedIPS(t *testing.T) {
|
func TestDeleteAlertTrustedIPS(t *testing.T) {
|
||||||
cfg := LoadTestConfig()
|
cfg := LoadTestConfig(t)
|
||||||
// IPv6 mocking doesn't seem to work.
|
// 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", "::"}
|
||||||
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"}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAPIKey(t *testing.T) {
|
func TestAPIKey(t *testing.T) {
|
||||||
router, config, err := NewAPITest()
|
router, config, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -206,7 +206,7 @@ func TestNewAPIC(t *testing.T) {
|
||||||
action: func() {},
|
action: func() {},
|
||||||
args: args{
|
args: args{
|
||||||
dbClient: getDBClient(t),
|
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://" },
|
action: func() { testConfig.Credentials.URL = "foobar http://" },
|
||||||
args: args{
|
args: args{
|
||||||
dbClient: getDBClient(t),
|
dbClient: getDBClient(t),
|
||||||
consoleConfig: LoadTestConfig().API.Server.ConsoleConfig,
|
consoleConfig: LoadTestConfig(t).API.Server.ConsoleConfig,
|
||||||
},
|
},
|
||||||
expectedErr: "first path segment in URL cannot contain colon",
|
expectedErr: "first path segment in URL cannot contain colon",
|
||||||
},
|
},
|
||||||
|
|
|
@ -37,13 +37,16 @@ var MachineTest = models.WatcherAuthRequest{
|
||||||
var UserAgent = fmt.Sprintf("crowdsec-test/%s", version.Version)
|
var UserAgent = fmt.Sprintf("crowdsec-test/%s", version.Version)
|
||||||
var emptyBody = strings.NewReader("")
|
var emptyBody = strings.NewReader("")
|
||||||
|
|
||||||
func LoadTestConfig() csconfig.Config {
|
func LoadTestConfig(t *testing.T) csconfig.Config {
|
||||||
config := csconfig.Config{}
|
config := csconfig.Config{}
|
||||||
maxAge := "1h"
|
maxAge := "1h"
|
||||||
flushConfig := csconfig.FlushDBCfg{
|
flushConfig := csconfig.FlushDBCfg{
|
||||||
MaxAge: &maxAge,
|
MaxAge: &maxAge,
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
||||||
|
t.Cleanup(func() { os.RemoveAll(tempDir) })
|
||||||
|
|
||||||
dbconfig := csconfig.DatabaseCfg{
|
dbconfig := csconfig.DatabaseCfg{
|
||||||
Type: "sqlite",
|
Type: "sqlite",
|
||||||
DbPath: filepath.Join(tempDir, "ent"),
|
DbPath: filepath.Join(tempDir, "ent"),
|
||||||
|
@ -69,13 +72,16 @@ func LoadTestConfig() csconfig.Config {
|
||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadTestConfigForwardedFor() csconfig.Config {
|
func LoadTestConfigForwardedFor(t *testing.T) csconfig.Config {
|
||||||
config := csconfig.Config{}
|
config := csconfig.Config{}
|
||||||
maxAge := "1h"
|
maxAge := "1h"
|
||||||
flushConfig := csconfig.FlushDBCfg{
|
flushConfig := csconfig.FlushDBCfg{
|
||||||
MaxAge: &maxAge,
|
MaxAge: &maxAge,
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
||||||
|
t.Cleanup(func() { os.RemoveAll(tempDir) })
|
||||||
|
|
||||||
dbconfig := csconfig.DatabaseCfg{
|
dbconfig := csconfig.DatabaseCfg{
|
||||||
Type: "sqlite",
|
Type: "sqlite",
|
||||||
DbPath: filepath.Join(tempDir, "ent"),
|
DbPath: filepath.Join(tempDir, "ent"),
|
||||||
|
@ -103,8 +109,8 @@ func LoadTestConfigForwardedFor() csconfig.Config {
|
||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAPIServer() (*APIServer, csconfig.Config, error) {
|
func NewAPIServer(t *testing.T) (*APIServer, csconfig.Config, error) {
|
||||||
config := LoadTestConfig()
|
config := LoadTestConfig(t)
|
||||||
os.Remove("./ent")
|
os.Remove("./ent")
|
||||||
apiServer, err := NewServer(config.API.Server)
|
apiServer, err := NewServer(config.API.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -115,8 +121,8 @@ func NewAPIServer() (*APIServer, csconfig.Config, error) {
|
||||||
return apiServer, config, nil
|
return apiServer, config, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAPITest() (*gin.Engine, csconfig.Config, error) {
|
func NewAPITest(t *testing.T) (*gin.Engine, csconfig.Config, error) {
|
||||||
apiServer, config, err := NewAPIServer()
|
apiServer, config, err := NewAPIServer(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, config, fmt.Errorf("unable to run local API: %s", err)
|
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
|
return router, config, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAPITestForwardedFor() (*gin.Engine, csconfig.Config, error) {
|
func NewAPITestForwardedFor(t *testing.T) (*gin.Engine, csconfig.Config, error) {
|
||||||
config := LoadTestConfigForwardedFor()
|
config := LoadTestConfigForwardedFor(t)
|
||||||
|
|
||||||
os.Remove("./ent")
|
os.Remove("./ent")
|
||||||
apiServer, err := NewServer(config.API.Server)
|
apiServer, err := NewServer(config.API.Server)
|
||||||
|
@ -285,7 +291,7 @@ func CreateTestBouncer(config *csconfig.DatabaseCfg) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestWithWrongDBConfig(t *testing.T) {
|
func TestWithWrongDBConfig(t *testing.T) {
|
||||||
config := LoadTestConfig()
|
config := LoadTestConfig(t)
|
||||||
config.API.Server.DbConfig.Type = "test"
|
config.API.Server.DbConfig.Type = "test"
|
||||||
apiServer, err := NewServer(config.API.Server)
|
apiServer, err := NewServer(config.API.Server)
|
||||||
|
|
||||||
|
@ -294,7 +300,7 @@ func TestWithWrongDBConfig(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestWithWrongFlushConfig(t *testing.T) {
|
func TestWithWrongFlushConfig(t *testing.T) {
|
||||||
config := LoadTestConfig()
|
config := LoadTestConfig(t)
|
||||||
maxItems := -1
|
maxItems := -1
|
||||||
config.API.Server.DbConfig.Flush.MaxItems = &maxItems
|
config.API.Server.DbConfig.Flush.MaxItems = &maxItems
|
||||||
apiServer, err := NewServer(config.API.Server)
|
apiServer, err := NewServer(config.API.Server)
|
||||||
|
@ -304,7 +310,7 @@ func TestWithWrongFlushConfig(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUnknownPath(t *testing.T) {
|
func TestUnknownPath(t *testing.T) {
|
||||||
router, _, err := NewAPITest()
|
router, _, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
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) {
|
func TestLoggingDebugToFileConfig(t *testing.T) {
|
||||||
|
|
||||||
/*declare settings*/
|
/*declare settings*/
|
||||||
maxAge := "1h"
|
maxAge := "1h"
|
||||||
flushConfig := csconfig.FlushDBCfg{
|
flushConfig := csconfig.FlushDBCfg{
|
||||||
MaxAge: &maxAge,
|
MaxAge: &maxAge,
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
||||||
|
t.Cleanup(func() { os.RemoveAll(tempDir) })
|
||||||
|
|
||||||
dbconfig := csconfig.DatabaseCfg{
|
dbconfig := csconfig.DatabaseCfg{
|
||||||
Type: "sqlite",
|
Type: "sqlite",
|
||||||
DbPath: filepath.Join(tempDir, "ent"),
|
DbPath: filepath.Join(tempDir, "ent"),
|
||||||
|
@ -398,7 +406,10 @@ func TestLoggingErrorToFileConfig(t *testing.T) {
|
||||||
flushConfig := csconfig.FlushDBCfg{
|
flushConfig := csconfig.FlushDBCfg{
|
||||||
MaxAge: &maxAge,
|
MaxAge: &maxAge,
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
|
||||||
|
t.Cleanup(func() { os.RemoveAll(tempDir) })
|
||||||
|
|
||||||
dbconfig := csconfig.DatabaseCfg{
|
dbconfig := csconfig.DatabaseCfg{
|
||||||
Type: "sqlite",
|
Type: "sqlite",
|
||||||
DbPath: filepath.Join(tempDir, "ent"),
|
DbPath: filepath.Join(tempDir, "ent"),
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestLogin(t *testing.T) {
|
func TestLogin(t *testing.T) {
|
||||||
router, config, err := NewAPITest()
|
router, config, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCreateMachine(t *testing.T) {
|
func TestCreateMachine(t *testing.T) {
|
||||||
router, _, err := NewAPITest()
|
router, _, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ func TestCreateMachine(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateMachineWithForwardedFor(t *testing.T) {
|
func TestCreateMachineWithForwardedFor(t *testing.T) {
|
||||||
router, config, err := NewAPITestForwardedFor()
|
router, config, err := NewAPITestForwardedFor(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ func TestCreateMachineWithForwardedFor(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateMachineWithForwardedForNoConfig(t *testing.T) {
|
func TestCreateMachineWithForwardedForNoConfig(t *testing.T) {
|
||||||
router, config, err := NewAPITest()
|
router, config, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ func TestCreateMachineWithForwardedForNoConfig(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateMachineWithoutForwardedFor(t *testing.T) {
|
func TestCreateMachineWithoutForwardedFor(t *testing.T) {
|
||||||
router, config, err := NewAPITestForwardedFor()
|
router, config, err := NewAPITestForwardedFor(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -143,7 +143,7 @@ func TestCreateMachineWithoutForwardedFor(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateMachineAlreadyExist(t *testing.T) {
|
func TestCreateMachineAlreadyExist(t *testing.T) {
|
||||||
router, _, err := NewAPITest()
|
router, _, err := NewAPITest(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("unable to run local API: %s", err)
|
log.Fatalf("unable to run local API: %s", err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue