more sentinel tweaks (#33)

Author: dleviminzi

pkg/metadata.go

@@ -31,6 +31,7 @@ func NewBlobCacheMetadata(cfg MetadataConfig) (*BlobCacheMetadata, error) {
 		Addrs:              []string{cfg.RedisAddr},
 		Mode:               redisMode,
 		Password:           cfg.RedisPasswd,
+		SentinelPassword:   cfg.RedisPasswd,
 		EnableTLS:          cfg.RedisTLSEnabled,
 		MasterName:         cfg.RedisMasterName,
 		InsecureSkipVerify: true, // HOTFIX: tailscale certs don't match in-cluster certs

pkg/redis_test.go

@@ -54,13 +54,16 @@ func Test_CopyConfig(t *testing.T) {
 			name:     "sentinel config",
 			sentinel: true,
 			inputConfig: RedisConfig{
-				Addrs:          []string{"localhost:26379"},
-				MasterName:     "mymaster",
-				RouteByLatency: true,
+				Addrs:            []string{"localhost:26379"},
+				MasterName:       "mymaster",
+				RouteByLatency:   true,
+				Password:         "password",
+				SentinelPassword: "sentinel_password",
 			},
 			expectedOptions: redis.UniversalOptions{
 				Addrs:      []string{"localhost:26379"},
 				MasterName: "mymaster",
+				Password:   "password",
 			},
 		},
 	}
@@ -82,6 +85,7 @@ func Test_CopyConfig(t *testing.T) {
 				failoverOpts := actualOptions.Failover()
 				assert.Equal(t, test.inputConfig.Addrs[0], failoverOpts.SentinelAddrs[0])
 				assert.Equal(t, test.inputConfig.MasterName, failoverOpts.MasterName)
+				assert.Equal(t, test.inputConfig.SentinelPassword, failoverOpts.SentinelPassword)
 			}
 		})
 	}

pkg/types.go

@@ -92,6 +92,7 @@ type RedisConfig struct {
 	Password           string        `key:"password" json:"password"`
 	RouteByLatency     bool          `key:"routeByLatency" json:"route_by_latency"`
 	MasterName         string        `key:"masterName" json:"master_name"`
+	SentinelPassword   string        `key:"sentinelPassword" json:"sentinel_password"`
 }
 
 type BlobFsConfig struct {