From 13814e11197ebd9101940883e3ca85998f86d442 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 15 Nov 2025 08:40:37 +0100 Subject: [PATCH] fix: env key replacer and remove unused function (#5547) --- cmd/root.go | 3 +-- cmd/utils.go | 16 +++------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 8f793742..d8be251a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -534,8 +534,7 @@ func initConfig() { v.SetEnvPrefix("FB") v.AutomaticEnv() - v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) - v.SetEnvKeyReplacer(strings.NewReplacer("-", "_")) + v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_")) if err := v.ReadInConfig(); err != nil { var configParseError v.ConfigParseError diff --git a/cmd/utils.go b/cmd/utils.go index 1971afd4..8e5168af 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -23,16 +23,8 @@ import ( const dbPerms = 0640 -func returnErr(err error) error { - if err != nil { - return err - } - return nil -} - func getString(flags *pflag.FlagSet, flag string) (string, error) { - s, err := flags.GetString(flag) - return s, returnErr(err) + return flags.GetString(flag) } func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) { @@ -48,13 +40,11 @@ func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) { } func getBool(flags *pflag.FlagSet, flag string) (bool, error) { - b, err := flags.GetBool(flag) - return b, returnErr(err) + return flags.GetBool(flag) } func getUint(flags *pflag.FlagSet, flag string) (uint, error) { - b, err := flags.GetUint(flag) - return b, returnErr(err) + return flags.GetUint(flag) } func generateKey() []byte {