fixd func slaveInfoFieldByName when slaveInfo have same key and value

Author: polefishu

pkg/client/redis/client.go

@@ -115,11 +115,14 @@ func (c *client) GetNumberSentinelSlavesInMemory(ip string, auth *util.AuthConfi
 
 func slaveInfoFieldByName(name string, slaveInfoBlob interface{}) string {
 	slaveInfo := slaveInfoBlob.([]interface{})
-	for key, value := range slaveInfo {
-		stringValue := value.(string)
+	infoLens := len(slaveInfo)
+	i := 0
+	for i < infoLens {
+		stringValue := slaveInfo[i].(string)
 		if stringValue == name {
-			return slaveInfo[key+1].(string)
+			return slaveInfo[i+1].(string)
 		}
+		i += 2
 	}
 	return ""
 }

pkg/client/redis/client_test.go

@@ -1,10 +1,10 @@
-package redis_test
+package redis
 
 import (
-	rediscli "github.com/go-redis/redis"
-	"github.com/ucloud/redis-operator/pkg/client/redis"
 	"strings"
 	"testing"
+
+	rediscli "github.com/go-redis/redis"
 )
 
 func newClient() *rediscli.Client {
@@ -18,7 +18,7 @@ func newClient() *rediscli.Client {
 func TestGetAllRedisConfig(t *testing.T) {
 	cli := newClient()
 	//var client redis.Client
-	client := redis.New()
+	client := New()
 	result, err := client.GetAllRedisConfig(cli)
 	if err != nil {
 		t.Fatal(err)
@@ -33,3 +33,41 @@ func TestGetAllRedisConfig(t *testing.T) {
 	}
 
 }
+
+func Test_slaveInfoFieldByName(t *testing.T) {
+	slaveInfoBlobA := []interface{}{"name", "[xxxxA]:6379", "ip", "xxxxA", "port", "6379", "runid", "6f792839ab551e8dbec58e0eb3b3838d14f19a37", "flags", "slave", "link-pending-commands", "1", "link-refcount", "1", "last-ping-sent", "0", "last-ok-ping-reply", "1055", "last-ping-reply", "1055", "down-after-milliseconds", "5000", "info-refresh", "2074", "role-reported", "slave", "role-reported-time", "2983115", "master-link-down-time", "0", "master-link-status", "ok", "master-host", "xxxxA", "master-port", "6379", "slave-priority", "1", "slave-repl-offset", "124614695"}
+	slaveInfoBlobB := []interface{}{"name", "[xxxxB]:6371", "ip", "xxxxB", "port", "6371", "runid", "fake_slave_8bb90711-8f37-44e8-b3b2-589af", "flags", "slave", "link-pending-commands", "1", "link-refcount", "1", "last-ping-sent", "0", "last-ok-ping-reply", "1055", "last-ping-reply", "1055", "down-after-milliseconds", "5000", "info-refresh", "2075", "role-reported", "slave", "role-reported-time", "2983114", "master-link-down-time", "0", "master-link-status", "ok", "master-host", "xxxxB", "master-port", "6379", "slave-priority", "0", "slave-repl-offset", "124614695"}
+	type args struct {
+		name          string
+		slaveInfoBlob interface{}
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "slaveA",
+			args: args{
+				name:          "slave-priority",
+				slaveInfoBlob: slaveInfoBlobA,
+			},
+			want: "1",
+		},
+		{
+			name: "slaveB",
+			args: args{
+				name:          "slave-priority",
+				slaveInfoBlob: slaveInfoBlobB,
+			},
+			want: "0",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := slaveInfoFieldByName(tt.args.name, tt.args.slaveInfoBlob); got != tt.want {
+				t.Errorf("slaveInfoFieldByName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}