Skip to content

Commit 23da09a

Browse files
arthurschreiberarthurschreiber
committed
Remove use and definition of GetFlagVariantForTests helper.
Signed-off-by: Arthur Schreiber <[email protected]>
1 parent 7bef872 commit 23da09a

File tree

84 files changed

+291
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+291
-407
lines changed

‎go/test/endtoend/backup/vtbackup/backup_only_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"vitess.io/vitess/go/test/endtoend/cluster"
3737
"vitess.io/vitess/go/vt/log"
3838
"vitess.io/vitess/go/vt/mysqlctl"
39-
"vitess.io/vitess/go/vt/utils"
4039
)
4140

4241
var (
@@ -240,12 +239,12 @@ func startVtBackup(t *testing.T, initialBackup bool, restartBeforeBackup, disabl
240239
extraArgs := []string{
241240
"--allow_first_backup",
242241
"--db-credentials-file", dbCredentialFile,
243-
utils.GetFlagVariantForTests("--mysql-socket"), mysqlSocket.Name(),
242+
"--mysql-socket", mysqlSocket.Name(),
244243

245244
// Use opentsdb for stats.
246-
utils.GetFlagVariantForTests("--stats-backend"), "opentsdb",
245+
"--stats-backend", "opentsdb",
247246
// Write stats to file for reading afterwards.
248-
utils.GetFlagVariantForTests("--opentsdb-uri"), "file://" + statsPath,
247+
"--opentsdb-uri", "file://" + statsPath,
249248
}
250249
if restartBeforeBackup {
251250
extraArgs = append(extraArgs, "--restart_before_backup")

‎go/test/endtoend/backup/vtbackup/main_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"vitess.io/vitess/go/test/endtoend/cluster"
2828
"vitess.io/vitess/go/test/endtoend/utils"
2929
"vitess.io/vitess/go/vt/log"
30-
vtutils "vitess.io/vitess/go/vt/utils"
3130
)
3231

3332
var (
@@ -44,12 +43,12 @@ var (
4443
shardKsName = fmt.Sprintf("%s/%s", keyspaceName, shardName)
4544
dbCredentialFile string
4645
commonTabletArg = []string{
47-
vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
48-
vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
49-
vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
50-
vtutils.GetFlagVariantForTests("--watch-replication-stream"),
51-
vtutils.GetFlagVariantForTests("--enable-replication-reporter"),
52-
vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s"}
46+
"--vreplication-retry-delay", "1s",
47+
"--degraded-threshold", "5s",
48+
"--lock-tables-timeout", "5s",
49+
"--watch-replication-stream",
50+
"--enable-replication-reporter",
51+
"--serving-state-grace-period", "1s"}
5352
)
5453

5554
func TestMain(m *testing.M) {

‎go/test/endtoend/backup/vtctlbackup/backup_utils.go‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import (
4646
"vitess.io/vitess/go/vt/proto/topodata"
4747
"vitess.io/vitess/go/vt/proto/vtrpc"
4848
"vitess.io/vitess/go/vt/sqlparser"
49-
vtutils "vitess.io/vitess/go/vt/utils"
5049
"vitess.io/vitess/go/vt/vterrors"
5150
)
5251

@@ -144,16 +143,16 @@ func LaunchCluster(setupType int, streamMode string, stripes int, cDetails *Comp
144143
switch setupType {
145144
case XtraBackup:
146145
xtrabackupArgs := []string{
147-
vtutils.GetFlagVariantForTests("--backup-engine-implementation"), "xtrabackup",
148-
fmt.Sprintf("%s=%s", vtutils.GetFlagVariantForTests("--xtrabackup-stream-mode"), streamMode),
149-
vtutils.GetFlagVariantForTests("--xtrabackup-user") + "=vt_dba",
150-
fmt.Sprintf("%s=%d", vtutils.GetFlagVariantForTests("--xtrabackup-stripes"), stripes),
151-
vtutils.GetFlagVariantForTests("--xtrabackup-backup-flags"), "--password=" + dbPassword,
146+
"--backup-engine-implementation", "xtrabackup",
147+
fmt.Sprintf("%s=%s", "--xtrabackup-stream-mode", streamMode),
148+
"--xtrabackup-user" + "=vt_dba",
149+
fmt.Sprintf("%s=%d", "--xtrabackup-stripes", stripes),
150+
"--xtrabackup-backup-flags", "--password=" + dbPassword,
152151
}
153152

154153
// if streamMode is xbstream, add some additional args to test other xtrabackup flags
155154
if streamMode == "xbstream" {
156-
xtrabackupArgs = append(xtrabackupArgs, vtutils.GetFlagVariantForTests("--xtrabackup-prepare-flags"), "--use-memory=100M")
155+
xtrabackupArgs = append(xtrabackupArgs, "--xtrabackup-prepare-flags", "--use-memory=100M")
157156
}
158157

159158
commonTabletArg = append(commonTabletArg, xtrabackupArgs...)
@@ -165,7 +164,7 @@ func LaunchCluster(setupType int, streamMode string, stripes int, cDetails *Comp
165164
}
166165

167166
mysqlShellArgs := []string{
168-
vtutils.GetFlagVariantForTests("--backup-engine-implementation"), "mysqlshell",
167+
"--backup-engine-implementation", "mysqlshell",
169168
"--mysql-shell-backup-location", mysqlShellBackupLocation,
170169
"--mysql-shell-speedup-restore=true",
171170
}
@@ -990,10 +989,10 @@ func restoreWaitForBackup(t *testing.T, tabletType string, cDetails *Compression
990989
replicaTabletArgs = updateCompressorArgs(replicaTabletArgs, cDetails)
991990
}
992991
if fakeImpl {
993-
replicaTabletArgs = append(replicaTabletArgs, vtutils.GetFlagVariantForTests("--backup-engine-implementation"), "fake_implementation")
992+
replicaTabletArgs = append(replicaTabletArgs, "--backup-engine-implementation", "fake_implementation")
994993
}
995-
replicaTabletArgs = append(replicaTabletArgs, vtutils.GetFlagVariantForTests("--wait-for-backup-interval"), "1s")
996-
replicaTabletArgs = append(replicaTabletArgs, vtutils.GetFlagVariantForTests("--init-tablet-type"), tabletType)
994+
replicaTabletArgs = append(replicaTabletArgs, "--wait-for-backup-interval", "1s")
995+
replicaTabletArgs = append(replicaTabletArgs, "--init-tablet-type", tabletType)
997996
replica2.VttabletProcess.ExtraArgs = replicaTabletArgs
998997
replica2.VttabletProcess.ServingStatus = ""
999998
err := replica2.VttabletProcess.Setup()
@@ -1491,12 +1490,12 @@ func verifyTabletRestoreStats(t *testing.T, vars map[string]any) {
14911490

14921491
func getDefaultCommonArgs() []string {
14931492
return []string{
1494-
vtutils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
1495-
vtutils.GetFlagVariantForTests("--degraded-threshold"), "5s",
1496-
vtutils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
1497-
vtutils.GetFlagVariantForTests("--watch-replication-stream"),
1498-
vtutils.GetFlagVariantForTests("--enable-replication-reporter"),
1499-
vtutils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
1493+
"--vreplication-retry-delay", "1s",
1494+
"--degraded-threshold", "5s",
1495+
"--lock-tables-timeout", "5s",
1496+
"--watch-replication-stream",
1497+
"--enable-replication-reporter",
1498+
"--serving-state-grace-period", "1s",
15001499
}
15011500
}
15021501

‎go/test/endtoend/cellalias/cell_alias_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535

3636
"vitess.io/vitess/go/test/endtoend/cluster"
3737
"vitess.io/vitess/go/vt/proto/topodata"
38-
"vitess.io/vitess/go/vt/utils"
3938
)
4039

4140
var (
@@ -54,13 +53,13 @@ var (
5453
) Engine=InnoDB
5554
`
5655
commonTabletArg = []string{
57-
utils.GetFlagVariantForTests("--vreplication-retry-delay"), "1s",
58-
utils.GetFlagVariantForTests("--degraded-threshold"), "5s",
59-
utils.GetFlagVariantForTests("--lock-tables-timeout"), "5s",
60-
utils.GetFlagVariantForTests("--watch-replication-stream"),
61-
utils.GetFlagVariantForTests("--enable-replication-reporter"),
62-
utils.GetFlagVariantForTests("--serving-state-grace-period"), "1s",
63-
utils.GetFlagVariantForTests("--binlog-player-protocol"), "grpc",
56+
"--vreplication-retry-delay", "1s",
57+
"--degraded-threshold", "5s",
58+
"--lock-tables-timeout", "5s",
59+
"--watch-replication-stream",
60+
"--enable-replication-reporter",
61+
"--serving-state-grace-period", "1s",
62+
"--binlog-player-protocol", "grpc",
6463
}
6564
vSchema = `
6665
{

‎go/test/endtoend/encryption/encryptedreplication/encrypted_replication_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"vitess.io/vitess/go/test/endtoend/cluster"
3030
"vitess.io/vitess/go/test/endtoend/encryption"
3131
"vitess.io/vitess/go/vt/log"
32-
"vitess.io/vitess/go/vt/utils"
3332
)
3433

3534
var (
@@ -62,9 +61,9 @@ func testReplicationBase(t *testing.T, isClientCertPassed bool) {
6261

6362
if isClientCertPassed {
6463
replicaTablet.VttabletProcess.ExtraArgs = append(replicaTablet.VttabletProcess.ExtraArgs,
65-
utils.GetFlagVariantForTests("--db-flags"), "2048",
66-
utils.GetFlagVariantForTests("--db-ssl-ca"), path.Join(certDirectory, "ca-cert.pem"),
67-
utils.GetFlagVariantForTests("--db-ssl-cert"), path.Join(certDirectory, "client-cert.pem"),
64+
"--db-flags", "2048",
65+
"--db-ssl-ca", path.Join(certDirectory, "ca-cert.pem"),
66+
"--db-ssl-cert", path.Join(certDirectory, "client-cert.pem"),
6867
"--db-ssl-key", path.Join(certDirectory, "client-key.pem"),
6968
)
7069
}

‎go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import (
6767
"vitess.io/vitess/go/test/endtoend/encryption"
6868

6969
"vitess.io/vitess/go/vt/proto/vtrpc"
70-
"vitess.io/vitess/go/vt/utils"
7170
"vitess.io/vitess/go/vt/vterrors"
7271

7372
"github.com/stretchr/testify/assert"
@@ -202,7 +201,7 @@ func useEffectiveCallerID(ctx context.Context, t *testing.T) {
202201
// now restart vtgate in the mode where we don't use SSL
203202
// for client connections, but we copy effective caller id
204203
// into immediate caller id.
205-
clusterInstance.VtGateExtraArgs = []string{utils.GetFlagVariantForTests("--grpc-use-effective-callerid")}
204+
clusterInstance.VtGateExtraArgs = []string{"--grpc-use-effective-callerid"}
206205
clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, tabletConnExtraArgs("vttablet-client-1")...)
207206
err := clusterInstance.RestartVtgate()
208207
require.NoError(t, err)
@@ -251,7 +250,7 @@ func useEffectiveGroups(ctx context.Context, t *testing.T) {
251250
// now restart vtgate in the mode where we don't use SSL
252251
// for client connections, but we copy effective caller's groups
253252
// into immediate caller id.
254-
clusterInstance.VtGateExtraArgs = []string{utils.GetFlagVariantForTests("--grpc-use-effective-callerid"), utils.GetFlagVariantForTests("--grpc-use-effective-groups")}
253+
clusterInstance.VtGateExtraArgs = []string{"--grpc-use-effective-callerid", "--grpc-use-effective-groups"}
255254
clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, tabletConnExtraArgs("vttablet-client-1")...)
256255
err := clusterInstance.RestartVtgate()
257256
require.NoError(t, err)
@@ -424,9 +423,9 @@ func createSignedCert(ca string, serial string, name string, commonName string)
424423

425424
func serverExtraArguments(name string, ca string) []string {
426425
args := []string{
427-
utils.GetFlagVariantForTests("--grpc-cert"), certDirectory + "/" + name + "-cert.pem",
428-
utils.GetFlagVariantForTests("--grpc-key"), certDirectory + "/" + name + "-key.pem",
429-
utils.GetFlagVariantForTests("--grpc-ca"), certDirectory + "/" + ca + "-cert.pem",
426+
"--grpc-cert", certDirectory + "/" + name + "-cert.pem",
427+
"--grpc-key", certDirectory + "/" + name + "-key.pem",
428+
"--grpc-ca", certDirectory + "/" + ca + "-cert.pem",
430429
}
431430
return args
432431
}
@@ -442,10 +441,10 @@ func tmclientExtraArgs(name string) []string {
442441

443442
func tabletConnExtraArgs(name string) []string {
444443
ca := "vttablet-server"
445-
args := []string{utils.GetFlagVariantForTests("--tablet-grpc-cert"), certDirectory + "/" + name + "-cert.pem",
446-
utils.GetFlagVariantForTests("--tablet-grpc-key"), certDirectory + "/" + name + "-key.pem",
447-
utils.GetFlagVariantForTests("--tablet-grpc-ca"), certDirectory + "/" + ca + "-cert.pem",
448-
utils.GetFlagVariantForTests("--tablet-grpc-server-name"), "vttablet server instance"}
444+
args := []string{"--tablet-grpc-cert", certDirectory + "/" + name + "-cert.pem",
445+
"--tablet-grpc-key", certDirectory + "/" + name + "-key.pem",
446+
"--tablet-grpc-ca", certDirectory + "/" + ca + "-cert.pem",
447+
"--tablet-grpc-server-name", "vttablet server instance"}
449448
return args
450449
}
451450

‎go/test/endtoend/mysqlserver/main_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"vitess.io/vitess/go/mysql"
2727
"vitess.io/vitess/go/test/endtoend/cluster"
28-
"vitess.io/vitess/go/vt/utils"
2928
)
3029

3130
var (
@@ -110,11 +109,11 @@ func TestMain(m *testing.M) {
110109

111110
clusterInstance.VtGateExtraArgs = []string{
112111
"--vschema-ddl-authorized-users=%",
113-
utils.GetFlagVariantForTests("--mysql-server-query-timeout"), "1s",
114-
utils.GetFlagVariantForTests("--mysql-auth-server-impl"), "static",
112+
"--mysql-server-query-timeout", "1s",
113+
"--mysql-auth-server-impl", "static",
115114
"--mysql-auth-server-static-file", clusterInstance.TmpDirectory + mysqlAuthServerStatic,
116-
utils.GetFlagVariantForTests("--mysql-server-version"), "8.0.16-7",
117-
utils.GetFlagVariantForTests("--warn-sharded-only") + "=true",
115+
"--mysql-server-version", "8.0.16-7",
116+
"--warn-sharded-only" + "=true",
118117
}
119118

120119
clusterInstance.VtTabletExtraArgs = []string{

‎go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
"vitess.io/vitess/go/vt/log"
3535
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
3636
"vitess.io/vitess/go/vt/schema"
37-
"vitess.io/vitess/go/vt/utils"
3837
"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
3938

4039
"vitess.io/vitess/go/test/endtoend/cluster"
@@ -157,13 +156,13 @@ func TestMain(m *testing.M) {
157156
}
158157

159158
clusterInstance.VtTabletExtraArgs = []string{
160-
utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
161-
utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
162-
utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
163-
utils.GetFlagVariantForTests("--watch-replication-stream"),
159+
"--heartbeat-interval", "250ms",
160+
"--heartbeat-on-demand-duration", "5s",
161+
"--migration-check-interval", "5s",
162+
"--watch-replication-stream",
164163
}
165164
clusterInstance.VtGateExtraArgs = []string{
166-
utils.GetFlagVariantForTests("--ddl-strategy"), "online",
165+
"--ddl-strategy", "online",
167166
}
168167

169168
if err := clusterInstance.StartTopo(); err != nil {

‎go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
"vitess.io/vitess/go/vt/log"
3535
"vitess.io/vitess/go/vt/schema"
3636
"vitess.io/vitess/go/vt/sqlparser"
37-
"vitess.io/vitess/go/vt/utils"
3837
"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
3938

4039
"vitess.io/vitess/go/test/endtoend/cluster"
@@ -252,10 +251,10 @@ func TestMain(m *testing.M) {
252251
}
253252

254253
clusterInstance.VtTabletExtraArgs = []string{
255-
utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
256-
utils.GetFlagVariantForTests("--heartbeat-on-demand-duration"), "5s",
257-
utils.GetFlagVariantForTests("--migration-check-interval"), "2s",
258-
utils.GetFlagVariantForTests("--watch-replication-stream"),
254+
"--heartbeat-interval", "250ms",
255+
"--heartbeat-on-demand-duration", "5s",
256+
"--migration-check-interval", "2s",
257+
"--watch-replication-stream",
259258
}
260259
clusterInstance.VtGateExtraArgs = []string{}
261260

‎go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"vitess.io/vitess/go/test/endtoend/onlineddl"
3636
"vitess.io/vitess/go/test/endtoend/throttler"
3737
"vitess.io/vitess/go/vt/schema"
38-
"vitess.io/vitess/go/vt/utils"
3938
"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
4039

4140
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
@@ -180,12 +179,12 @@ func TestMain(m *testing.M) {
180179
}
181180

182181
clusterInstance.VtTabletExtraArgs = []string{
183-
utils.GetFlagVariantForTests("--heartbeat-interval"), "250ms",
184-
utils.GetFlagVariantForTests("--migration-check-interval"), "5s",
185-
utils.GetFlagVariantForTests("--watch-replication-stream"),
182+
"--heartbeat-interval", "250ms",
183+
"--migration-check-interval", "5s",
184+
"--watch-replication-stream",
186185
}
187186
clusterInstance.VtGateExtraArgs = []string{
188-
utils.GetFlagVariantForTests("--ddl-strategy"), "online",
187+
"--ddl-strategy", "online",
189188
}
190189

191190
if err := clusterInstance.StartTopo(); err != nil {

0 commit comments

Comments
 (0)