Add latest changes from gitlab-org/gitlab@master

2 files changed, 76 insertions, 7 deletions

diff --git a/workhorse/internal/goredis/goredis.go b/workhorse/internal/goredis/goredis.go
index 13a9d4cc34f..5566e5a3434 100644
--- a/workhorse/internal/goredis/goredis.go
+++ b/workhorse/internal/goredis/goredis.go
@@ -150,17 +150,12 @@ func configureRedis(cfg *config.RedisConfig) (*redis.Client, error) {
 }
 
 func configureSentinel(cfg *config.RedisConfig) *redis.Client {
-	sentinels := make([]string, len(cfg.Sentinel))
-	for i := range cfg.Sentinel {
-		sentinelDetails := cfg.Sentinel[i]
-		sentinels[i] = fmt.Sprintf("%s:%s", sentinelDetails.Hostname(), sentinelDetails.Port())
-	}
-
+	sentinelPassword, sentinels := sentinelOptions(cfg)
 	client := redis.NewFailoverClient(&redis.FailoverOptions{
 		MasterName:       cfg.SentinelMaster,
 		SentinelAddrs:    sentinels,
 		Password:         cfg.Password,
-		SentinelPassword: cfg.SentinelPassword,
+		SentinelPassword: sentinelPassword,
 		DB:               getOrDefault(cfg.DB, 0),
 
 		PoolSize:        getOrDefault(cfg.MaxActive, defaultMaxActive),
@@ -178,6 +173,25 @@ func configureSentinel(cfg *config.RedisConfig) *redis.Client {
 	return client
 }
 
+// sentinelOptions extracts the sentinel password and addresses in <host>:<port> format
+// the order of priority for the passwords is: SentinelPassword -> first password-in-url
+func sentinelOptions(cfg *config.RedisConfig) (string, []string) {
+	sentinels := make([]string, len(cfg.Sentinel))
+	sentinelPassword := cfg.SentinelPassword
+
+	for i := range cfg.Sentinel {
+		sentinelDetails := cfg.Sentinel[i]
+		sentinels[i] = fmt.Sprintf("%s:%s", sentinelDetails.Hostname(), sentinelDetails.Port())
+
+		if pw, exist := sentinelDetails.User.Password(); exist && len(sentinelPassword) == 0 {
+			// sets password using the first non-empty password
+			sentinelPassword = pw
+		}
+	}
+
+	return sentinelPassword, sentinels
+}
+
 func getOrDefault(ptr *int, val int) int {
 	if ptr != nil {
 		return *ptr
diff --git a/workhorse/internal/goredis/goredis_test.go b/workhorse/internal/goredis/goredis_test.go
index 6b281229ea4..735b2076b0c 100644
--- a/workhorse/internal/goredis/goredis_test.go
+++ b/workhorse/internal/goredis/goredis_test.go
@@ -105,3 +105,58 @@ func TestConnectToSentinel(t *testing.T) {
 		})
 	}
 }
+
+func TestSentinelOptions(t *testing.T) {
+	testCases := []struct {
+		description           string
+		inputSentinelPassword string
+		inputSentinel         []string
+		password              string
+		sentinels             []string
+	}{
+		{
+			description:   "no sentinel passwords",
+			inputSentinel: []string{"tcp://localhost:26480"},
+			sentinels:     []string{"localhost:26480"},
+		},
+		{
+			description:           "specific sentinel password defined",
+			inputSentinel:         []string{"tcp://localhost:26480"},
+			inputSentinelPassword: "password1",
+			sentinels:             []string{"localhost:26480"},
+			password:              "password1",
+		},
+		{
+			description:   "specific sentinel password defined in url",
+			inputSentinel: []string{"tcp://:password2@localhost:26480", "tcp://:password3@localhost:26481"},
+			sentinels:     []string{"localhost:26480", "localhost:26481"},
+			password:      "password2",
+		},
+		{
+			description:           "passwords defined specifically and in url",
+			inputSentinel:         []string{"tcp://:password2@localhost:26480", "tcp://:password3@localhost:26481"},
+			sentinels:             []string{"localhost:26480", "localhost:26481"},
+			inputSentinelPassword: "password1",
+			password:              "password1",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.description, func(t *testing.T) {
+			sentinelUrls := make([]config.TomlURL, len(tc.inputSentinel))
+
+			for i, str := range tc.inputSentinel {
+				parsedURL := helper.URLMustParse(str)
+				sentinelUrls[i] = config.TomlURL{URL: *parsedURL}
+			}
+
+			outputPw, outputSentinels := sentinelOptions(&config.RedisConfig{
+				Sentinel:         sentinelUrls,
+				SentinelPassword: tc.inputSentinelPassword,
+			})
+
+			require.Equal(t, tc.password, outputPw)
+			require.Equal(t, tc.sentinels, outputSentinels)
+		})
+	}
+}