fix: Use Vipers config finder

minekube · Jul 12, 2023 · 1c75a1b · 1c75a1b
1 parent ef86ad3
commit 1c75a1b
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/cmd/gate/root.go b/cmd/gate/root.go
@@ -132,10 +132,21 @@ func initViper(c *cli.Context, configFile string) (*viper.Viper, error) {
 
 // FixedReadInConfig is a workaround for https://github.com/minekube/gate/issues/218#issuecomment-1632800775
 func FixedReadInConfig[T any](v *viper.Viper, configFile string, defaultConfig *T) error {
-	if configFile == "" || defaultConfig == nil {
+	if defaultConfig == nil {
 		return v.ReadInConfig()
 	}
 
+	if configFile == "" {
+		// Try to find config file using Viper's config finder logic
+		if err := v.ReadInConfig(); err != nil {
+			return err
+		}
+		configFile = v.ConfigFileUsed()
+		if configFile == "" {
+			return nil // no config file found
+		}
+	}
+
 	var (
 		unmarshal func([]byte, any) error
 		marshal   func(any) ([]byte, error)