From be33d3f773dd18a6bf11cfc3bb247c5405d163a9 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Tue, 2 Aug 2022 00:47:20 +0400 Subject: [PATCH 1/2] [#186] Don't print env vars with empty values Signed-off-by: Angira Kekteeva --- settings.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/settings.go b/settings.go index c6ad084..52de560 100644 --- a/settings.go +++ b/settings.go @@ -182,8 +182,13 @@ func settings() *viper.Viper { continue } + defaultValue := v.GetString(keys[i]) + if len(defaultValue) == 0 { + continue + } + k := strings.Replace(keys[i], ".", "_", -1) - fmt.Printf("%s_%s = %v\n", Prefix, strings.ToUpper(k), v.Get(keys[i])) + fmt.Printf("%s_%s = %s\n", Prefix, strings.ToUpper(k), defaultValue) } fmt.Println() From 447128749a288da178d3027f4a2a62b2203b4143 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Tue, 2 Aug 2022 00:52:07 +0400 Subject: [PATCH 2/2] [#186] Improve wallet params Signed-off-by: Angira Kekteeva --- app.go | 10 ++-------- settings.go | 8 ++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app.go b/app.go index bd9dd1d..107cb39 100644 --- a/app.go +++ b/app.go @@ -181,10 +181,7 @@ func remove(list []string, element string) []string { } func getNeoFSKey(a *app) (*ecdsa.PrivateKey, error) { - walletPath := a.cfg.GetString(cmdWallet) - if len(walletPath) == 0 { - walletPath = a.cfg.GetString(cfgWalletPath) - } + walletPath := a.cfg.GetString(cfgWalletPath) if len(walletPath) == 0 { a.log.Info("no wallet path specified, creating ephemeral key automatically for this run") @@ -205,10 +202,7 @@ func getNeoFSKey(a *app) (*ecdsa.PrivateKey, error) { password = &pwd } - address := a.cfg.GetString(cmdAddress) - if len(address) == 0 { - address = a.cfg.GetString(cfgWalletAddress) - } + address := a.cfg.GetString(cfgWalletAddress) return getKeyFromWallet(w, address, password) } diff --git a/settings.go b/settings.go index 52de560..c9e6648 100644 --- a/settings.go +++ b/settings.go @@ -154,6 +154,14 @@ func settings() *viper.Viper { panic(err) } + if err := v.BindPFlag(cfgWalletPath, flags.Lookup(cmdWallet)); err != nil { + panic(err) + } + + if err := v.BindPFlag(cfgWalletAddress, flags.Lookup(cmdAddress)); err != nil { + panic(err) + } + if err := v.BindPFlags(flags); err != nil { panic(err) }