dev: Use Redis client instead of Config

cmd/internal/shared/config.go

@@ -148,9 +148,6 @@ var DefaultKeyVaultConfig = config.KeyVault{
 // DefaultRateLimitingConfig is the default config for rate limiting.
 var DefaultRateLimitingConfig = config.RateLimiting{
 	Provider: "memory",
-	Redis: config.RateLimitingRedis{
-		Config: DefaultRedisConfig,
-	},
 }
 
 // DefaultTracingConfig is the default config for telemetry tracing.

cmd/ttn-lw-stack/commands/start.go

@@ -103,6 +103,14 @@ func NewJoinServerSessionKeyRegistryRedis(conf *Config) *redis.Client {
 	return redis.New(conf.Redis.WithNamespace("js", "keys"))
 }
 
+// NewRateLimitingRedis instantiates a new redis client with the Rate Limiting namespace.
+func NewRateLimitingRedis(conf *Config) *redis.Client {
+	if conf.RateLimiting.Provider != "redis" {
+		return nil
+	}
+	return redis.New(conf.Cache.Redis.WithNamespace("rate-limiting"))
+}
+
 var errUnknownComponent = errors.DefineInvalidArgument("unknown_component", "unknown component `{component}`")
 
 var startCommand = &cobra.Command{
@@ -218,6 +226,7 @@ var startCommand = &cobra.Command{
 			logger.Warn("No cookie block key configured, generated a random one")
 		}
 
+		config.RateLimiting.Redis.Client = NewRateLimitingRedis(config)
 		c, err := component.New(logger, &component.Config{ServiceBase: config.ServiceBase}, componentOptions...)
 		if err != nil {
 			return shared.ErrInitializeBaseComponent.WithCause(err)

pkg/config/shared.go

@@ -551,7 +551,7 @@ func (f MQTTConfigProviderFunc) GetMQTTConfig(ctx context.Context) (*MQTT, error
 
 // RateLimitingRedis represents configuration for the in-Redis rate limiting store.
 type RateLimitingRedis struct {
-	Config redis.Config `name:"config"`
+	Client *redis.Client `name:"-"`
 }
 
 // RateLimitingProfile represents configuration for a rate limiting class.

pkg/gatewayserver/io/udp/udp.go

@@ -73,7 +73,7 @@ func Serve(ctx context.Context, server io.Server, conn *net.UDPConn, conf Config
 	}
 	limitLogs, err := ratelimit.NewProfile(ctx, limitLogsConfig, ratelimit.StoreConfig{
 		Provider: conf.RateLimiting.Provider,
-		Redis:    ratelimit.NewRedisClient(conf.RateLimiting.Redis.Config),
+		Redis:    conf.RateLimiting.Redis.Client,
 	})
 	if err != nil {
 		return err

pkg/ratelimit/config.go

@@ -39,11 +39,6 @@ type StoreConfig struct {
 	Redis    *ttnredis.Client
 }
 
-// NewRedisClient creates a new Redis client with rate-limiting namespace.
-func NewRedisClient(conf ttnredis.Config) *ttnredis.Client {
-	return ttnredis.New(conf.WithNamespace("rate-limiting"))
-}
-
 // New creates a new ratelimit.Interface from configuration.
 func New(ctx context.Context, conf config.RateLimiting, blobConf config.BlobConfig, httpClientProvider httpclient.Provider) (Interface, error) {
 	defaultLimiter := &NoopRateLimiter{}
@@ -81,7 +76,7 @@ func New(ctx context.Context, conf config.RateLimiting, blobConf config.BlobConf
 		limiter, err := NewProfile(ctx, profile, StoreConfig{
 			Provider: conf.Provider,
 			Memory:   conf.Memory,
-			Redis:    NewRedisClient(conf.Redis.Config),
+			Redis:    conf.Redis.Client,
 		})
 		if err != nil {
 			return nil, err