Merge branch 'master' into patch-1

Author: ndyakov

universal.go

@@ -69,6 +69,9 @@ type UniversalOptions struct {
 	DisableIndentity bool
 	IdentitySuffix   string
 	UnstableResp3    bool
+
+	// IsClusterMode can be used when only one Addrs is provided (e.g. Elasticache supports setting up cluster mode with configuration endpoint).
+	IsClusterMode bool
 }
 
 // Cluster returns cluster options created from the universal options.
@@ -246,7 +249,7 @@ var (
 func NewUniversalClient(opts *UniversalOptions) UniversalClient {
 	if opts.MasterName != "" {
 		return NewFailoverClient(opts.Failover())
-	} else if len(opts.Addrs) > 1 {
+	} else if len(opts.Addrs) > 1 || opts.IsClusterMode {
 		return NewClusterClient(opts.Cluster())
 	}
 	return NewClient(opts.Simple())

universal_test.go

@@ -61,7 +61,6 @@ var _ = Describe("UniversalClient", func() {
 		Expect(a).ToNot(Panic())
 	})
 
-
 	It("should connect to failover servers on slaves when readonly Options is ok", func() {
 		client = redis.NewUniversalClient(&redis.UniversalOptions{
 			MasterName: sentinelName,
@@ -85,6 +84,21 @@ var _ = Describe("UniversalClient", func() {
 
 	})
 
+	It("should connect to clusters if IsClusterMode is set even if only a single address is provided", Label("NonRedisEnterprise"), func() {
+		client = redis.NewUniversalClient(&redis.UniversalOptions{
+			Addrs:         []string{cluster.addrs()[0]},
+			IsClusterMode: true,
+		})
+		_, ok := client.(*redis.ClusterClient)
+		Expect(ok).To(BeTrue(), "expected a ClusterClient")
+	})
 
+	It("should return all slots after instantiating UniversalClient with IsClusterMode", Label("NonRedisEnterprise"), func() {
+		client = redis.NewUniversalClient(&redis.UniversalOptions{
+			Addrs:         []string{cluster.addrs()[0]},
+			IsClusterMode: true,
+		})
+		Expect(client.ClusterSlots(ctx).Val()).To(HaveLen(3))
+	})
 })