Fix tabletmanager tests

Signed-off-by: Matt Lord <[email protected]>

go/cmd/vtctldclient/command/topology.go

@@ -102,8 +102,8 @@ var writeTopologyPathOptions = struct {
 }{}
 
 func commandWriteTopologyPath(cmd *cobra.Command, args []string) error {
-	path := cmd.Flags().Arg(0)
-	file := cmd.Flags().Arg(1)
+	file := cmd.Flags().Arg(0)
+	path := cmd.Flags().Arg(1)
 	ts, err := topo.OpenServer(topoOptions.implementation, strings.Join(topoOptions.globalServerAddresses, ","), topoOptions.globalRoot)
 	if err != nil {
 		return fmt.Errorf("failed to connect to the topology server: %v", err)

go/test/endtoend/cluster/vtctldclient_process.go

@@ -90,7 +90,7 @@ func (vtctldclient *VtctldClientProcess) ExecuteCommandWithOutput(args ...string
 	}
 	if !slices.Contains(args, "--server") {
 		// Only add the default server if one was not already specified.
-		args = append(args, "--server", vtctldclient.Server)
+		pArgs = append(pArgs, "--server", vtctldclient.Server)
 	}
 	if *isCoverage {
 		pArgs = append(pArgs, "--test.coverprofile="+getCoveragePath("vtctldclient-"+args[0]+".out"), "--test.v")

go/test/endtoend/tabletmanager/custom_rule_topo_test.go

@@ -54,7 +54,7 @@ func TestTopoCustomRule(t *testing.T) {
 	require.NoError(t, err)
 
 	// Copy config file into topo.
-	err = clusterInstance.VtctldClientProcess.ExecuteCommand("WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
+	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
 	require.Nil(t, err, "error should be Nil")
 
 	// Set extra tablet args for topo custom rule
@@ -100,7 +100,7 @@ func TestTopoCustomRule(t *testing.T) {
 	err = os.WriteFile(topoCustomRuleFile, data, 0777)
 	require.NoError(t, err)
 
-	err = clusterInstance.VtctldClientProcess.ExecuteCommand("WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
+	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
 	require.Nil(t, err, "error should be Nil")
 
 	// And wait until the query fails with the right error.