diff --git a/accounts/pkg/config/defaults/defaultconfig.go b/accounts/pkg/config/defaults/defaultconfig.go index b26d18fbfd..bf62637ece 100644 --- a/accounts/pkg/config/defaults/defaultconfig.go +++ b/accounts/pkg/config/defaults/defaultconfig.go @@ -78,7 +78,7 @@ func DefaultConfig() *config.Config { } } -func EnsureDefaults(cfg *config.Config) error { +func EnsureDefaults(cfg *config.Config) { // provide with defaults for shared logging, since we need a valid destination address for BindEnv. if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil { cfg.Log = &config.Log{ @@ -101,8 +101,6 @@ func EnsureDefaults(cfg *config.Config) error { } else if cfg.Tracing == nil { cfg.Tracing = &config.Tracing{} } - - return nil } func Sanitize(cfg *config.Config) { diff --git a/accounts/pkg/config/parser/parse.go b/accounts/pkg/config/parser/parse.go index c252765a58..f689ee528c 100644 --- a/accounts/pkg/config/parser/parse.go +++ b/accounts/pkg/config/parser/parse.go @@ -17,10 +17,7 @@ func ParseConfig(cfg *config.Config) error { return err } - err = defaults.EnsureDefaults(cfg) - if err != nil { - return err - } + defaults.EnsureDefaults(cfg) // load all env variables relevant to the config in the current context. if err := envdecode.Decode(cfg); err != nil {