From efdcf0249abe59914ce99b9d8a0b5ac8930c4b02 Mon Sep 17 00:00:00 2001
From: drivebyer <wuyangmuc@gmail.com>
Date: Sun, 18 Sep 2022 17:49:16 +0800
Subject: [PATCH] fix: disable save break process in custom config

fix #262 #411 #124
---
 service/redis/client.go                       |  3 ++
 .../redisfailover/creation_test.go            | 36 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/service/redis/client.go b/service/redis/client.go
index da7e9c84e..988d7e539 100644
--- a/service/redis/client.go
+++ b/service/redis/client.go
@@ -331,6 +331,9 @@ func (c *client) getConfigParameters(config string) (parameter string, value str
 	if len(s) < 2 {
 		return "", "", fmt.Errorf("configuration '%s' malformed", config)
 	}
+	if len(s) == 2 && s[1] == `""` {
+		return s[0], "", nil
+	}
 	return s[0], strings.Join(s[1:], " "), nil
 }
 
diff --git a/test/integration/redisfailover/creation_test.go b/test/integration/redisfailover/creation_test.go
index 00eb5c656..88f4657bb 100644
--- a/test/integration/redisfailover/creation_test.go
+++ b/test/integration/redisfailover/creation_test.go
@@ -6,10 +6,13 @@ package redisfailover_test
 import (
 	"context"
 	"fmt"
+	"net"
 	"path/filepath"
 	"testing"
 	"time"
 
+	rediscli "github.com/go-redis/redis/v8"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
@@ -137,6 +140,9 @@ func TestRedisFailover(t *testing.T) {
 	// Verify that auth is set and actually working
 	t.Run("Check that auth is set in sentinel and redis configs", clients.testAuth)
 
+	// Check custom config is set
+	t.Run("Check that custom config is behave expected", clients.testCustomConfig)
+
 	// Check that a Redis Statefulset is created and the size of it is the one defined by the
 	// Redis Failover definition created before.
 	t.Run("Check Redis Statefulset existing and size", clients.testRedisStatefulSet)
@@ -168,6 +174,7 @@ func (c *clients) testCRCreation(t *testing.T) {
 				Exporter: redisfailoverv1.Exporter{
 					Enabled: true,
 				},
+				CustomConfig: []string{`save ""`},
 			},
 			Sentinel: redisfailoverv1.SentinelSettings{
 				Replicas: sentinelSize,
@@ -274,3 +281,32 @@ func (c *clients) testAuth(t *testing.T) {
 	assert.Equal(redisSS.Spec.Template.Spec.Containers[1].Env[4].ValueFrom.SecretKeyRef.Key, "password")
 	assert.Equal(redisSS.Spec.Template.Spec.Containers[1].Env[4].ValueFrom.SecretKeyRef.LocalObjectReference.Name, authSecretPath)
 }
+
+func (c *clients) testCustomConfig(t *testing.T) {
+	assert := assert.New(t)
+
+	redisSS, err := c.k8sClient.AppsV1().StatefulSets(namespace).Get(context.Background(), fmt.Sprintf("rfr-%s", name), metav1.GetOptions{})
+	assert.NoError(err)
+
+	listOptions := metav1.ListOptions{
+		LabelSelector: labels.FormatLabels(redisSS.Spec.Selector.MatchLabels),
+	}
+	redisPodList, err := c.k8sClient.CoreV1().Pods(namespace).List(context.Background(), listOptions)
+	assert.NoError(err)
+
+	rClient := rediscli.NewClient(&rediscli.Options{
+		Addr:     net.JoinHostPort(redisPodList.Items[0].Status.PodIP, "6379"),
+		Password: testPass,
+		DB:       0,
+	})
+	defer rClient.Close()
+
+	result := rClient.ConfigGet(context.TODO(), "save")
+	assert.NoError(result.Err())
+
+	values, err := result.Result()
+	assert.NoError(err)
+
+	assert.Len(values, 2)
+	assert.Empty(values[1])
+}