From 7631e2a9b50f5c75ce44dce296f90da56e2f90f0 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 19 Oct 2021 14:40:45 +0200 Subject: [PATCH] pass boolean clear argument to DBInit() --- database/database.go | 4 ++-- database/database_test.go | 12 ++++++------ routes/component-configuration/config_test.go | 2 +- routes/dashboard/dashboard_test.go | 2 +- routes/file/file_test.go | 2 +- routes/healthz/healthz_test.go | 4 ++-- routes/infrastructure-component/ic_test.go | 2 +- routes/register_test.go | 2 +- routes/result/result_test.go | 2 +- routes/scenario/scenario_test.go | 2 +- routes/signal/signal_test.go | 2 +- routes/user/user_test.go | 2 +- routes/widget/widget_test.go | 2 +- start.go | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/database/database.go b/database/database.go index db2e074..5d21e54 100644 --- a/database/database.go +++ b/database/database.go @@ -38,7 +38,7 @@ import ( var DBpool *gorm.DB // database used by backend // InitDB Initialize connection to the database -func InitDB(cfg *config.Config, dbClear string) error { +func InitDB(cfg *config.Config, clear bool) error { name, err := cfg.String("db.name") if err != nil { return err @@ -76,7 +76,7 @@ func InitDB(cfg *config.Config, dbClear string) error { DBpool = db // drop tables if parameter set - if dbClear == "true" { + if clear { DropTables() log.Println("Database tables dropped") } diff --git a/database/database_test.go b/database/database_test.go index 1af89ab..6eff3c3 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -50,41 +50,41 @@ func TestInitDB(t *testing.T) { ownconfig := config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.Error(t, err) dbname, err := configuration.GlobalConfig.String("db.name") assert.NoError(t, err) static["db.name"] = dbname ownconfig = config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.Error(t, err) dbhost, err := configuration.GlobalConfig.String("db.host") assert.NoError(t, err) static["db.host"] = dbhost ownconfig = config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.Error(t, err) dbuser, err := configuration.GlobalConfig.String("db.user") assert.NoError(t, err) static["db.user"] = dbuser ownconfig = config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.Error(t, err) dbpass, err := configuration.GlobalConfig.String("db.pass") assert.NoError(t, err) static["db.pass"] = dbpass ownconfig = config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.Error(t, err) dbssl, err := configuration.GlobalConfig.String("db.ssl") assert.NoError(t, err) static["db.ssl"] = dbssl ownconfig = config.NewConfig([]config.Provider{defaults, env}) - err = InitDB(ownconfig, "true") + err = InitDB(ownconfig, true) assert.NoError(t, err) // Verify that you can connect to the database diff --git a/routes/component-configuration/config_test.go b/routes/component-configuration/config_test.go index eadb004..e0de543 100644 --- a/routes/component-configuration/config_test.go +++ b/routes/component-configuration/config_test.go @@ -147,7 +147,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/dashboard/dashboard_test.go b/routes/dashboard/dashboard_test.go index a2f1b61..dd1d64a 100644 --- a/routes/dashboard/dashboard_test.go +++ b/routes/dashboard/dashboard_test.go @@ -87,7 +87,7 @@ func TestMain(m *testing.M) { if err != nil { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/file/file_test.go b/routes/file/file_test.go index 9c66f6e..57b74f8 100644 --- a/routes/file/file_test.go +++ b/routes/file/file_test.go @@ -81,7 +81,7 @@ func TestMain(m *testing.M) { if err != nil { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/healthz/healthz_test.go b/routes/healthz/healthz_test.go index 6202654..e0956af 100644 --- a/routes/healthz/healthz_test.go +++ b/routes/healthz/healthz_test.go @@ -41,7 +41,7 @@ func TestHealthz(t *testing.T) { assert.NoError(t, err) // connect DB - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) assert.NoError(t, err) defer database.DBpool.Close() @@ -60,7 +60,7 @@ func TestHealthz(t *testing.T) { assert.Equalf(t, 500, code, "Response body: \n%v\n", resp) // reconnect DB - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) assert.NoError(t, err) defer database.DBpool.Close() diff --git a/routes/infrastructure-component/ic_test.go b/routes/infrastructure-component/ic_test.go index 013d897..4790017 100644 --- a/routes/infrastructure-component/ic_test.go +++ b/routes/infrastructure-component/ic_test.go @@ -115,7 +115,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/register_test.go b/routes/register_test.go index 8b112bb..9654a28 100644 --- a/routes/register_test.go +++ b/routes/register_test.go @@ -43,7 +43,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/result/result_test.go b/routes/result/result_test.go index ab4475f..268d561 100644 --- a/routes/result/result_test.go +++ b/routes/result/result_test.go @@ -98,7 +98,7 @@ func TestMain(m *testing.M) { if err != nil { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/scenario/scenario_test.go b/routes/scenario/scenario_test.go index 2aaf761..a61c63c 100644 --- a/routes/scenario/scenario_test.go +++ b/routes/scenario/scenario_test.go @@ -72,7 +72,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/signal/signal_test.go b/routes/signal/signal_test.go index 68cc323..84767b6 100644 --- a/routes/signal/signal_test.go +++ b/routes/signal/signal_test.go @@ -159,7 +159,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/user/user_test.go b/routes/user/user_test.go index 8231afb..97fdcec 100644 --- a/routes/user/user_test.go +++ b/routes/user/user_test.go @@ -56,7 +56,7 @@ func TestMain(m *testing.M) { if err != nil { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/routes/widget/widget_test.go b/routes/widget/widget_test.go index dd9ecd3..2b55488 100644 --- a/routes/widget/widget_test.go +++ b/routes/widget/widget_test.go @@ -122,7 +122,7 @@ func TestMain(m *testing.M) { panic(m) } - err = database.InitDB(configuration.GlobalConfig, "true") + err = database.InitDB(configuration.GlobalConfig, true) if err != nil { panic(m) } diff --git a/start.go b/start.go index 42f0fdd..b8088d2 100644 --- a/start.go +++ b/start.go @@ -101,7 +101,7 @@ func main() { } // Init database - err = database.InitDB(configuration.GlobalConfig, dbClear) + err = database.InitDB(configuration.GlobalConfig, dbClear == "true") if err != nil { log.Fatalf("Error during initialization of database: %s, aborting.", err) }