From de447018183fe7406c4025c0eeaf06e858da88a2 Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Thu, 11 Jun 2026 15:48:35 +0200 Subject: [PATCH] Fix config compatibility after dependency bumps - Implement GetAdminOrigin and GetUserOrigin required by cf-test-helpers v2.13.0 - Interpret basic_timeout and long_timeout in config.yml as seconds; viper v1.21.0 changed time.Duration parsing to treat plain integers as nanoseconds, which broke existing user configs - Move timeout defaults from NewConfig to viper.SetDefault so the new seconds multiplication applies uniformly --- helpers/config.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/helpers/config.go b/helpers/config.go index 67a02ce..9b8c4ac 100644 --- a/helpers/config.go +++ b/helpers/config.go @@ -48,8 +48,6 @@ func NewConfig() Config { LargePageSize: 500, LargeElementsFilter: 100, Samples: 5, - BasicTimeout: 60 * time.Second, - LongTimeout: 180 * time.Second, } } @@ -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 { @@ -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()) @@ -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) }