Use flags helper in VReplication Config constructor

Signed-off-by: Rohit Nayak <[email protected]>

Author: rohit-nayak-ps

go/test/endtoend/vtgate/schematracker/viewsdisabled/schema_views_disabled_test.go

@@ -26,6 +26,7 @@ import (
 	"os"
 	"testing"
 	"time"
+
 	vtutils "vitess.io/vitess/go/vt/utils"
 
 	"github.com/stretchr/testify/assert"

go/test/endtoend/vtgate/vschema/vschema_test.go

@@ -133,7 +133,7 @@ func writeConfig(path string, cfg map[string]string) error {
 	return json.NewEncoder(file).Encode(cfg)
 }
 
-func TestVSchema1(t *testing.T) {
+func TestVSchema(t *testing.T) {
 	ctx := context.Background()
 	conn, err := mysql.Connect(ctx, &vtParams)
 	require.NoError(t, err)

go/vt/vttablet/common/config.go

@@ -24,6 +24,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"vitess.io/vitess/go/test/endtoend/cluster"
+	vtutils "vitess.io/vitess/go/vt/utils"
 )
 
 /*
@@ -131,6 +133,10 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 	getError := func(k, v string) string {
 		return fmt.Sprintf("invalid value for %s: %s", k, v)
 	}
+	vttabletVersion, err := cluster.GetMajorVersion("vttablet")
+	if err != nil {
+		return nil, err
+	}
 	for k, v := range overrides {
 		if v == "" {
 			continue
@@ -178,14 +184,14 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 			} else {
 				c.MaxTimeToRetryError = value
 			}
-		case "relay-log-max-size", "relay_log_max_size":
+		case vtutils.GetFlagVariantForTestsByVersion("relay-log-max-size", vttabletVersion):
 			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
 				c.RelayLogMaxSize = value
 			}
-		case "relay-log-max-items", "relay_log_max_items":
+		case vtutils.GetFlagVariantForTestsByVersion("relay-log-max-items", vttabletVersion):
 			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))