fixed: MIGRATE cmd with auth when password set

Author: polefishu

.gitignore

@@ -79,4 +79,5 @@ tags
 vendor/*
 /main
 /Dockerfile-withvendor
-Dockerfile-TZSH
+Dockerfile-TZSH
+skaffold.yaml

pkg/redisutil/admin.go

@@ -388,12 +388,7 @@ func (a *Admin) MigrateKeys(addr string, dest *Node, slots []Slot, batch int, ti
 				break
 			}
 
-			var args []string
-			if replace {
-				args = append([]string{dest.IP, dest.Port, "", "0", timeoutStr, "REPLACE", "KEYS"}, keys...)
-			} else {
-				args = append([]string{dest.IP, dest.Port, "", "0", timeoutStr, "KEYS"}, keys...)
-			}
+			args := a.migrateCmdArgs(dest, timeoutStr, replace, keys)
 
 			resp = c.Cmd("MIGRATE", args)
 			if err := a.Connections().ValidateResp(resp, addr, "Unable to run command MIGRATE"); err != nil {
@@ -432,12 +427,7 @@ func (a *Admin) MigrateKeysInSlot(addr string, dest *Node, slot Slot, batch int,
 			break
 		}
 
-		var args []string
-		if replace {
-			args = append([]string{dest.IP, dest.Port, "", "0", timeoutStr, "REPLACE", "KEYS"}, keys...)
-		} else {
-			args = append([]string{dest.IP, dest.Port, "", "0", timeoutStr, "KEYS"}, keys...)
-		}
+		args := a.migrateCmdArgs(dest, timeoutStr, replace, keys)
 
 		resp = c.Cmd("MIGRATE", args)
 		if err := a.Connections().ValidateResp(resp, addr, "Unable to run command MIGRATE"); err != nil {
@@ -448,6 +438,20 @@ func (a *Admin) MigrateKeysInSlot(addr string, dest *Node, slot Slot, batch int,
 	return keyCount, nil
 }
 
+func (a *Admin) migrateCmdArgs(dest *Node, timeoutStr string, replace bool, keys []string) []string {
+	args := []string{dest.IP, dest.Port, "", "0", timeoutStr}
+	if password, ok := a.Connections().GetAUTH(); ok {
+		args = append(args, "AUTH", password)
+	}
+	if replace {
+		args = append(args, "REPLACE", "KEYS")
+	} else {
+		args = append(args, "KEYS")
+	}
+	args = append(args, keys...)
+	return args
+}
+
 // ForgetNode used to force other redis cluster node to forget a specific node
 func (a *Admin) ForgetNode(id string) error {
 	infos, _ := a.GetClusterInfos()

pkg/redisutil/connections.go

@@ -58,6 +58,8 @@ type IAdminConnections interface {
 	ValidatePipeResp(c IClient, addr, errMessage string) bool
 	// Reset close all connections and clear the connection map
 	Reset()
+	// GetAUTH return password and true if connection password is set, else return false.
+	GetAUTH() (string, bool)
 }
 
 // AdminConnections connection map for redis cluster
@@ -98,6 +100,14 @@ func NewAdminConnections(addrs []string, options *AdminOptions, log logr.Logger)
 	return cnx
 }
 
+// GetAUTH return password and true if connection password is set, else return false.
+func (cnx *AdminConnections) GetAUTH() (string, bool) {
+	if len(cnx.password) > 0 {
+		return cnx.password, true
+	}
+	return "", false
+}
+
 // Reconnect force a reconnection on the given address
 // is the adress is not part of the map, act like Add
 func (cnx *AdminConnections) Reconnect(addr string) error {