Skip to content

chore: propagate errors from failed config parsing #779

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: propagate errors from failed config parsing #779

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
10 changes: 5 additions & 5 deletions internal/config/config_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,21 @@ func (c *ConfigHandler) getConfig() (Config, error) {
// contain sensitive data from the config file or data that is being read in
err := c.mainViper.MergeInConfig()
if err != nil {
return Config{}, fmt.Errorf("could not read the main configuration file")
return Config{}, fmt.Errorf("could not read the main configuration file: %w", err)
}
// read secret config
err = c.secretViper.ReadInConfig()
if err != nil {
switch err.(type) {
default:
return Config{}, fmt.Errorf("reading in the secret config failed")
return Config{}, fmt.Errorf("reading in the secret config failed: %w", err)
case viper.ConfigFileNotFoundError:
slog.Info("could not find any secret config files - only the public file and environment variables will be used")
}
}
err = c.mainViper.MergeConfigMap(c.secretViper.AllSettings())
if err != nil {
return Config{}, fmt.Errorf("could not merge the secret file config")
return Config{}, fmt.Errorf("could not merge the secret file config: %w", err)
}
// read environment variables
envVarsFiltered := []string{}
Expand All @@ -109,7 +109,7 @@ func (c *ConfigHandler) getConfig() (Config, error) {
envViper.SetConfigType("env")
err = envViper.ReadConfig(envBuf)
if err != nil {
return Config{}, fmt.Errorf("could not read the environment variables into a config")
return Config{}, fmt.Errorf("could not read the environment variables into a config: %w", err)
}
envData := envViper.AllSettings()
prefix := strings.ToLower(c.envPrefix)
Expand All @@ -127,7 +127,7 @@ func (c *ConfigHandler) getConfig() (Config, error) {
)
err = c.mainViper.Unmarshal(&output, dh)
if err != nil {
return Config{}, fmt.Errorf("cannot unmarshal the combined config into a struct")
return Config{}, fmt.Errorf("cannot unmarshal the combined config into a struct: %w", err)
}
// NOTE: set PRODUCTION as the default running environment
runningEnvironment := Production
Expand Down
Loading