Merge pull request #52 from Icinga/redis-username-config

redis: Configurable Username

Author: julianbrost

redis/client.go

@@ -52,6 +52,7 @@ func NewClientFromConfig(c *Config, logger *logging.Logger) (*Client, error) {
 
 	options := &redis.Options{
 		Dialer:      dialWithLogging(dialer, logger),
+		Username:    c.Username,
 		Password:    c.Password,
 		DB:          c.Database,
 		ReadTimeout: c.Options.Timeout,

redis/config.go

@@ -44,6 +44,7 @@ func (o *Options) Validate() error {
 type Config struct {
 	Host       string     `yaml:"host"`
 	Port       int        `yaml:"port"`
+	Username   string     `yaml:"username"`
 	Password   string     `yaml:"password"`
 	Database   int        `yaml:"database" default:"0"`
 	TlsOptions config.TLS `yaml:",inline"`
@@ -56,5 +57,9 @@ func (r *Config) Validate() error {
 		return errors.New("Redis host missing")
 	}
 
+	if r.Username != "" && r.Password == "" {
+		return errors.New("Redis password must be set, if username is provided")
+	}
+
 	return r.Options.Validate()
 }