Skip to content

Fix config compatibility after dependency bumps #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svkrieger wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix config compatibility after dependency bumps #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions helpers/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ func NewConfig() Config {
LargePageSize: 500,
LargeElementsFilter: 100,
Samples: 5,
BasicTimeout: 60 * time.Second,
LongTimeout: 180 * time.Second,
}
}

Expand All @@ -68,6 +66,8 @@ func (config Config) GetShouldKeepUser() bool { return true }
func (config Config) GetConfigurableTestPassword() string { return "" }
func (config Config) GetAdminClient() string { return config.Users.Admin.Client }
func (config Config) GetAdminClientSecret() string { return config.Users.Admin.ClientSecret }
func (config Config) GetAdminOrigin() string { return "" }
func (config Config) GetUserOrigin() string { return "" }
func (config Config) GetExistingClient() string { return config.Users.Existing.Client }
func (config Config) GetExistingClientSecret() string { return config.Users.Existing.ClientSecret }
func (config Config) GetApiEndpoint() string {
Expand Down Expand Up @@ -103,6 +103,8 @@ func LoadConfig(testConfig *Config) {
viper.SetDefault("results_folder", "../../test-results")
viper.SetDefault("test_resource_prefix", "perf")
viper.SetDefault("database_type", PsqlDb)
viper.SetDefault("basic_timeout", 60)
viper.SetDefault("long_timeout", 180)
err := viper.ReadInConfig()
if err != nil {
log.Fatalf("error loading config: %s", err.Error())
Expand All @@ -112,6 +114,9 @@ func LoadConfig(testConfig *Config) {
log.Fatalf("error parsing config: %s", err.Error())
}

testConfig.BasicTimeout *= time.Second
testConfig.LongTimeout *= time.Second

if testConfig.DatabaseType != PsqlDb && testConfig.DatabaseType != MysqlDb {
log.Fatalf("'database_type' parameter must be one of '%s' or '%s'", PsqlDb, MysqlDb)
}
Expand Down