From 83e9d741327f718ecfd48dca3b6430d11fab788a Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 10 Feb 2022 16:59:54 +0100 Subject: [PATCH] Use flagext.Secret for etcd password Signed-off-by: Marco Pracucci --- kv/etcd/etcd.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kv/etcd/etcd.go b/kv/etcd/etcd.go index 0661fc5da..3195368b9 100644 --- a/kv/etcd/etcd.go +++ b/kv/etcd/etcd.go @@ -27,8 +27,8 @@ type Config struct { EnableTLS bool `yaml:"tls_enabled" category:"advanced"` TLS dstls.ClientConfig `yaml:",inline"` - UserName string `yaml:"username"` - Password string `yaml:"password"` + UserName string `yaml:"username"` + Password flagext.Secret `yaml:"password"` } // Clientv3Facade is a subset of all Etcd client operations that are required @@ -58,7 +58,7 @@ func (cfg *Config) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix string) { f.IntVar(&cfg.MaxRetries, prefix+"etcd.max-retries", 10, "The maximum number of retries to do for failed ops.") f.BoolVar(&cfg.EnableTLS, prefix+"etcd.tls-enabled", false, "Enable TLS.") f.StringVar(&cfg.UserName, prefix+"etcd.username", "", "Etcd username.") - f.StringVar(&cfg.Password, prefix+"etcd.password", "", "Etcd password.") + f.Var(&cfg.Password, prefix+"etcd.password", "Etcd password.") cfg.TLS.RegisterFlagsWithPrefix(prefix+"etcd", f) } @@ -105,7 +105,7 @@ func New(cfg Config, codec codec.Codec, logger log.Logger) (*Client, error) { PermitWithoutStream: true, TLS: tlsConfig, Username: cfg.UserName, - Password: cfg.Password, + Password: cfg.Password.String(), }) if err != nil { return nil, err