feat: hide InitAddress when connecting to a Redis cluster using NewCl…

…ient()

cluster.go

@@ -39,6 +39,7 @@ type clusterClient struct {
 type connrole struct {
 	conn    conn
 	replica bool
+	hidden  bool
 }
 
 func newClusterClient(opt *ClientOption, connFn connFn, retryer retryHandler) (*clusterClient, error) {
@@ -204,7 +205,8 @@ func (c *clusterClient) _refresh() (err error) {
 	for _, addr := range c.opt.InitAddress {
 		if _, ok := conns[addr]; !ok {
 			conns[addr] = connrole{
-				conn: c.connFn(addr, c.opt),
+				conn:   c.connFn(addr, c.opt),
+				hidden: true,
 			}
 		}
 	}
@@ -218,6 +220,7 @@ func (c *clusterClient) _refresh() (err error) {
 			conns[addr] = connrole{
 				conn:    cc.conn,
 				replica: fresh.replica,
+				hidden:  fresh.hidden,
 			}
 		} else {
 			removes = append(removes, cc.conn)
@@ -289,8 +292,11 @@ func (c *clusterClient) single() (conn conn) {
 func (c *clusterClient) nodes() []string {
 	c.mu.RLock()
 	nodes := make([]string, 0, len(c.conns))
-	for addr := range c.conns {
-		nodes = append(nodes, addr)
+	for addr, role := range c.conns {
+		// only display non-hidden connrole
+		if !role.hidden {
+			nodes = append(nodes, addr)
+		}
 	}
 	c.mu.RUnlock()
 	return nodes
@@ -1113,7 +1119,9 @@ func (c *clusterClient) Nodes() map[string]Client {
 	nodes := make(map[string]Client, len(c.conns))
 	disableCache := c.opt != nil && c.opt.DisableCache
 	for addr, cc := range c.conns {
-		nodes[addr] = newSingleClientWithConn(cc.conn, c.cmd, c.retry, disableCache, c.retryHandler)
+		if !cc.hidden {
+			nodes[addr] = newSingleClientWithConn(cc.conn, c.cmd, c.retry, disableCache, c.retryHandler)
+		}
 	}
 	c.mu.RUnlock()
 	return nodes

cluster_test.go

@@ -876,10 +876,9 @@ func TestClusterClientInit(t *testing.T) {
 		testFunc := func(t *testing.T, client *clusterClient, num *int64) {
 			nodes := client.nodes()
 			sort.Strings(nodes)
-			if len(nodes) != 3 ||
+			if len(nodes) != 2 ||
 				nodes[0] != "127.0.0.1:0" ||
-				nodes[1] != "127.0.1.1:1" ||
-				nodes[2] != "127.0.2.1:2" {
+				nodes[1] != "127.0.1.1:1" {
 				t.Fatalf("unexpected nodes %v", nodes)
 			}
 
@@ -891,10 +890,8 @@ func TestClusterClientInit(t *testing.T) {
 
 			nodes = client.nodes()
 			sort.Strings(nodes)
-			if len(nodes) != 3 ||
-				nodes[0] != "127.0.1.1:1" ||
-				nodes[1] != "127.0.2.1:2" ||
-				nodes[2] != "127.0.3.1:3" {
+			if len(nodes) != 1 ||
+				nodes[0] != "127.0.3.1:3" {
 				t.Fatalf("unexpected nodes %v", nodes)
 			}
 		}
@@ -963,11 +960,11 @@ func TestClusterClientInit(t *testing.T) {
 		}
 		nodes := client.nodes()
 		sort.Strings(nodes)
-		if len(nodes) != 4 ||
-			nodes[0] != "127.0.0.1:0" ||
-			nodes[1] != "127.0.1.1:1" ||
-			nodes[2] != "127.0.2.1:2" ||
-			nodes[3] != "127.0.3.1:3" {
+		if len(nodes) != 3 ||
+			// 127.0.0.1:0 is hidden
+			nodes[0] != "127.0.1.1:1" ||
+			nodes[1] != "127.0.2.1:2" ||
+			nodes[2] != "127.0.3.1:3" {
 			t.Fatalf("unexpected nodes %v", nodes)
 		}
 	})