Add TLS connection to redis.

formancehq · Mar 15, 2022 · a2ff841 · a2ff841
1 parent dbce7f7
commit a2ff841
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/cmd/container.go b/cmd/container.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"crypto/tls"
 	"fmt"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
@@ -90,10 +91,18 @@ func NewContainer(v *viper.Viper, options ...fx.Option) *fx.App {
 	case "none":
 		options = append(options, ledger.NoLockModule())
 	case "redis":
+		var tlsConfig *tls.Config
+		if viper.GetBool(lockStrategyRedisTLSEnabledFlag) {
+			tlsConfig = &tls.Config{}
+			if viper.GetBool(lockStrategyRedisTLSInsecureFlag) {
+				tlsConfig.InsecureSkipVerify = true
+			}
+		}
 		options = append(options, redis.Module(redis.Config{
 			Url:          v.GetString(lockStrategyRedisUrlFlag),
 			LockDuration: v.GetDuration(lockStrategyRedisDurationFlag),
 			LockRetry:    v.GetDuration(lockStrategyRedisRetryFlag),
+			TLSConfig:    tlsConfig,
 		}))
 	}
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -28,6 +28,8 @@ const (
 	lockStrategyRedisUrlFlag             = "lock-strategy-redis-url"
 	lockStrategyRedisDurationFlag        = "lock-strategy-redis-duration"
 	lockStrategyRedisRetryFlag           = "lock-strategy-redis-retry"
+	lockStrategyRedisTLSEnabledFlag      = "lock-strategy-redis-tls-enabled"
+	lockStrategyRedisTLSInsecureFlag     = "lock-strategy-redis-tls-insecure"
 	otelTracesFlag                       = "otel-traces"
 	otelTracesBatchFlag                  = "otel-traces-batch"
 	otelTracesExporterFlag               = "otel-traces-exporter"
@@ -126,6 +128,8 @@ func NewRootCommand() *cobra.Command {
 	root.PersistentFlags().String(lockStrategyRedisUrlFlag, "", "Redis url when using redis locking strategy")
 	root.PersistentFlags().Duration(lockStrategyRedisDurationFlag, redis.DefaultLockDuration, "Lock duration")
 	root.PersistentFlags().Duration(lockStrategyRedisRetryFlag, redis.DefaultRetryInterval, "Retry lock period")
+	root.PersistentFlags().Bool(lockStrategyRedisTLSEnabledFlag, false, "Use tls on redis")
+	root.PersistentFlags().Bool(lockStrategyRedisTLSInsecureFlag, false, "Whether redis is trusted or not")
 
 	viper.BindPFlags(root.PersistentFlags())
 	viper.SetConfigName("numary")

diff --git a/pkg/redis/module.go b/pkg/redis/module.go
@@ -1,6 +1,7 @@
 package redis
 
 import (
+	"crypto/tls"
 	"github.com/go-redis/redis/v8"
 	"github.com/numary/ledger/pkg/ledger"
 	"go.uber.org/fx"
@@ -18,6 +19,7 @@ type Config struct {
 	Url          string
 	LockDuration time.Duration
 	LockRetry    time.Duration
+	TLSConfig    *tls.Config
 }
 
 func Module(cfg Config) fx.Option {
@@ -33,6 +35,7 @@ func Module(cfg Config) fx.Option {
 			if err != nil {
 				return nil, err
 			}
+			options.TLSConfig = cfg.TLSConfig
 			return redis.NewClient(options), nil
 		}),
 		ledger.ProvideResolverOption(func(redisClient Client) ledger.ResolverOption {