Merge branch 'main' into jose/issues-50

underdog-tech · Oct 25, 2023 · 9037176 · 9037176
2 parents 965ffdb + 43cade8
commit 9037176
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -58,14 +58,15 @@ func GetUserConfig(configFile string) (Config, error) {
 	}
 	viper.SetConfigFile(configFile)
 	if err := viper.ReadInConfig(); err != nil {
-		log.Fatal().Err(err).Msg("Error reading config file.")
+		log.Error().Err(err).Msg("Error reading config file.")
+		return Config{}, err
 	}
 
 	// (Optionally) Load a .env file
 	if fileExists("./.env") {
 		viper.SetConfigFile("./.env")
 		viper.SetConfigType("env")
-		if err := viper.ReadInConfig(); err != nil {
+		if err := viper.MergeInConfig(); err != nil {
 			log.Error().Err(err).Msg("Error loading .env file.")
 		}
 	} else {
@@ -78,8 +79,9 @@ func GetUserConfig(configFile string) (Config, error) {
 	viper.SetEnvPrefix("vulnbot")
 	viper.AutomaticEnv()
 
-	// Finally, copy all loaded values into the config object
-	_ = viper.Unmarshal(&userCfg)
+	if err := viper.Unmarshal(&userCfg); err != nil {
+		return Config{}, err
+	}
 
 	return userCfg, nil
 }