Support for redis master ACL

Signed-off-by: my036811 <miner.yang@broadcom.com>

Author: MinerYang

pkg/redisx/pool.go

@@ -70,6 +70,7 @@ func newSentinelPool(configURL *url.URL, config etc.RedisPool) (*redis.Client, e
 		SentinelAddrs: sentinelURL.Addrs,
 		DB:            sentinelURL.Database,
 		Password:      sentinelURL.Password,
+		Username:      sentinelURL.Username,
 
 		DialTimeout:  config.ConnectionTimeout,
 		ReadTimeout:  config.ReadTimeout,
@@ -88,6 +89,7 @@ func newSentinelPool(configURL *url.URL, config etc.RedisPool) (*redis.Client, e
 
 type SentinelURL struct {
 	Password    string
+	Username    string
 	Addrs       []string
 	MonitorName string
 	Database    int
@@ -110,6 +112,7 @@ func ParseSentinelURL(configURL *url.URL) (sentinelURL SentinelURL, err error) {
 	}
 
 	if user := configURL.User; user != nil {
+		sentinelURL.Username = user.Username()
 		if password, set := user.Password(); set {
 			sentinelURL.Password = password
 		}

pkg/redisx/pool_test.go

@@ -36,6 +36,7 @@ func TestParseSentinelURL(t *testing.T) {
 		{
 			configURL: "redis+sentinel://harbor:s3cret@somehost:26379,otherhost:26479/mymaster/3",
 			expectedSentinelURL: SentinelURL{
+				Username: "harbor",
 				Password: "s3cret",
 				Addrs: []string{
 					"somehost:26379",
@@ -48,6 +49,7 @@ func TestParseSentinelURL(t *testing.T) {
 		{
 			configURL: "redis+sentinel://:s3cret@somehost:26379,otherhost:26479/mymaster/5",
 			expectedSentinelURL: SentinelURL{
+				Username: "",
 				Password: "s3cret",
 				Addrs: []string{
 					"somehost:26379",
@@ -60,6 +62,7 @@ func TestParseSentinelURL(t *testing.T) {
 		{
 			configURL: "redis+sentinel://:s3cret@somehost:26379,otherhost:26479/mymaster",
 			expectedSentinelURL: SentinelURL{
+				Username: "",
 				Password: "s3cret",
 				Addrs: []string{
 					"somehost:26379",
@@ -69,6 +72,19 @@ func TestParseSentinelURL(t *testing.T) {
 				Database:    0,
 			},
 		},
+		{
+			configURL: "rediss+sentinel://foo:mypwd@somehost:26379,otherhost:26479/mymaster",
+			expectedSentinelURL: SentinelURL{
+				Username: "foo",
+				Password: "mypwd",
+				Addrs: []string{
+					"somehost:26379",
+					"otherhost:26479",
+				},
+				MonitorName: "mymaster",
+				Database:    0,
+			},
+		},
 		{
 			configURL:     "redis+sentinel://:s3cret@somehost:26379,otherhost:26479/mymaster/X",
 			expectedError: "invalid redis sentinel URL: invalid database number: X",