feat(redis): add support for specifying username

Author: RangerRick

diode-server/cmd/ingester/main.go

@@ -68,12 +68,16 @@ func main() {
 		os.Exit(1)
 	}
 
-	redisStreamClient := redis.NewClient(&redis.Options{
+	redisOptions := redis.Options{
 		Addr:      fmt.Sprintf("%s:%s", cfg.RedisHost, cfg.RedisPort),
 		Password:  cfg.RedisPassword,
 		DB:        cfg.RedisStreamDB,
 		TLSConfig: redisTLSConfig,
-	})
+	}
+	if cfg.RedisUsername != "" {
+		redisOptions.Username = cfg.RedisUsername
+	}
+	redisStreamClient := redis.NewClient(&redisOptions)
 
 	if _, err := redisStreamClient.Ping(ctx).Result(); err != nil {
 		s.Logger().Error("failed to connect to redis stream", "redisStream", redisStreamClient.String(), "error", err)

diode-server/cmd/reconciler/main.go

@@ -84,25 +84,33 @@ func main() {
 		os.Exit(1)
 	}
 
-	redisClient := redis.NewClient(&redis.Options{
+	redisOptions := redis.Options{
 		Addr:      fmt.Sprintf("%s:%s", cfg.RedisHost, cfg.RedisPort),
 		Password:  cfg.RedisPassword,
 		DB:        cfg.RedisDB,
 		TLSConfig: redisTLSConfig,
-	})
+	}
+	if cfg.RedisUsername != "" {
+		redisOptions.Username = cfg.RedisUsername
+	}
+	redisClient := redis.NewClient(&redisOptions)
 
 	if _, err := redisClient.Ping(ctx).Result(); err != nil {
 		s.Logger().Error("failed to connect to redis", "redis", redisClient.String(), "error", err)
 		metricRecorder.RecordServiceStartupAttempt(ctx, false)
 		os.Exit(1)
 	}
 
-	redisStreamClient := redis.NewClient(&redis.Options{
+	redisStreamOptions := redis.Options{
 		Addr:      fmt.Sprintf("%s:%s", cfg.RedisHost, cfg.RedisPort),
 		Password:  cfg.RedisPassword,
 		DB:        cfg.RedisStreamDB,
 		TLSConfig: redisTLSConfig,
-	})
+	}
+	if cfg.RedisUsername != "" {
+		redisStreamOptions.Username = cfg.RedisUsername
+	}
+	redisStreamClient := redis.NewClient(&redisStreamOptions)
 
 	if _, err := redisStreamClient.Ping(ctx).Result(); err != nil {
 		s.Logger().Error("failed to connect to redis stream", "redisStream", redisStreamClient.String(), "error", err)

diode-server/ingester/config.go

@@ -10,6 +10,7 @@ type Config struct {
 	GRPCPort      int    `envconfig:"GRPC_PORT" default:"8081"`
 	RedisHost     string `envconfig:"REDIS_HOST" default:"127.0.0.1"`
 	RedisPort     string `envconfig:"REDIS_PORT" default:"6379"`
+	RedisUsername string `envconfig:"REDIS_USERNAME"`
 	RedisPassword string `envconfig:"REDIS_PASSWORD" required:"true"`
 	RedisStreamDB int    `envconfig:"REDIS_STREAM_DB" default:"1"`
 

diode-server/reconciler/config.go

@@ -10,6 +10,7 @@ type Config struct {
 	GRPCPort                      int    `envconfig:"GRPC_PORT" default:"8081"`
 	RedisHost                     string `envconfig:"REDIS_HOST" default:"127.0.0.1"`
 	RedisPort                     string `envconfig:"REDIS_PORT" default:"6379"`
+	RedisUsername                 string `envconfig:"REDIS_USERNAME"`
 	RedisPassword                 string `envconfig:"REDIS_PASSWORD" required:"true"`
 	RedisDB                       int    `envconfig:"REDIS_DB" default:"0"`
 	RedisStreamDB                 int    `envconfig:"REDIS_STREAM_DB" default:"1"`

diode-server/reconciler/server.go

@@ -37,12 +37,16 @@ func NewServer(ctx context.Context, logger *slog.Logger, repository Repository,
 		return nil, fmt.Errorf("failed to create TLS config for Redis: %v", err)
 	}
 
-	redisClient := redis.NewClient(&redis.Options{
+	redisOptions := redis.Options{
 		Addr:      fmt.Sprintf("%s:%s", cfg.RedisHost, cfg.RedisPort),
 		Password:  cfg.RedisPassword,
 		DB:        cfg.RedisDB,
 		TLSConfig: redisTLSConfig,
-	})
+	}
+	if cfg.RedisUsername != "" {
+		redisOptions.Username = cfg.RedisUsername
+	}
+	redisClient := redis.NewClient(&redisOptions)
 
 	if _, err := redisClient.Ping(ctx).Result(); err != nil {
 		return nil, fmt.Errorf("failed connection to %s: %v", redisClient.String(), err)