run: remove our wrapper from instance start

Now 'tt run' starts instance without our wrapper.

Follow up #696

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 running apps.
 - `tt rocks --server` now accepts several URL's.
 - Disable ``tt run`` tarantool flag parsing.
+- Now ``tt run`` starts instance without our wrapper.
 
 ### Added
 

cli/cmd/run.go

@@ -1,10 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-	"strings"
-
 	"github.com/spf13/cobra"
 	"github.com/tarantool/tt/cli/cmdcontext"
 	"github.com/tarantool/tt/cli/modules"
@@ -85,29 +81,10 @@ func internalRunModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	runInfo := newRunInfo(*cmdCtx)
-	scriptPath := ""
-	startIndex := 0
-	if len(args) > 0 {
-		for i, option := range args {
-			if strings.HasSuffix(option, ".lua") {
-				scriptPath = option
-				if _, err := os.Stat(scriptPath); err != nil {
-					return fmt.Errorf("there was some problem locating script: %s", err)
-				}
-				startIndex = i
-				break
-			}
-		}
-	}
 
-	if len(args) != 0 && scriptPath != "" {
-		runInfo.RunOpts.RunArgs = args[startIndex+1:]
-		runInfo.RunOpts.RunFlags = args[:startIndex]
-	} else if scriptPath == "" {
-		runInfo.RunOpts.RunFlags = args
-	}
+	runInfo.RunOpts.RunArgs = args
 
-	if err := running.Run(runInfo, scriptPath); err != nil {
+	if err := running.Run(runInfo); err != nil {
 		return err
 	}
 

cli/running/cluster_instance.go

@@ -147,7 +147,6 @@ func (inst *clusterInstance) Run(opts RunOpts) error {
 	}
 	f.Close()
 
-	args = append(args, opts.RunFlags...)
 	args = append(args, opts.RunArgs...)
 	log.Debugf("Running Tarantool with args: %s", strings.Join(args[1:], " "))
 	execErr := syscall.Exec(inst.tarantoolPath, args, newInstanceEnv)

cli/running/running.go

@@ -97,8 +97,6 @@ type InstanceCtx struct {
 type RunOpts struct {
 	// RunArgs contains command args.
 	RunArgs []string
-	// RunFlags contains command flags.
-	RunFlags []string
 }
 
 // RunInfo contains information for tt run.
@@ -675,9 +673,8 @@ func Stop(run *InstanceCtx) error {
 }
 
 // Run runs an Instance.
-func Run(runInfo *RunInfo, scriptPath string) error {
-	inst := scriptInstance{tarantoolPath: runInfo.CmdCtx.Cli.TarantoolCli.Executable,
-		appPath: scriptPath}
+func Run(runInfo *RunInfo) error {
+	inst := scriptInstance{tarantoolPath: runInfo.CmdCtx.Cli.TarantoolCli.Executable}
 	err := inst.Run(runInfo.RunOpts)
 	return err
 }

cli/running/script_instance.go

@@ -219,29 +219,7 @@ func (inst *scriptInstance) Run(opts RunOpts) error {
 	}
 	f.Close()
 	newInstanceEnv := os.Environ()
-	newInstanceEnv = append(newInstanceEnv,
-		"TT_CLI_INSTANCE="+inst.appPath,
-		"TT_CLI=true",
-	)
 	args := []string{inst.tarantoolPath}
-	args = append(args, opts.RunFlags...)
-	if inst.appPath != "" {
-		log.Debugf("Script to run: %s", inst.appPath)
-
-		// Save current stdin file descriptor. It will be used in launcher lua
-		// script to restore original stdin.
-		stdinFd, _ := syscall.Dup(int(os.Stdin.Fd()))
-		newInstanceEnv = append(newInstanceEnv, fmt.Sprintf("TT_CLI_RUN_STDIN_FD=%d", stdinFd))
-
-		// Replace current stdin with pipe descriptor, and write launcher code to this pipe.
-		// Tarantool will read from pipe after exec.
-		stdinReader, stdinWriter, _ := os.Pipe()
-		syscall.Dup2(int(stdinReader.Fd()), int(os.Stdin.Fd()))
-		stdinWriter.Write([]byte(instanceLauncher))
-
-		// Enable reading from input for Tarantool.
-		args = append(args, "-")
-	}
 	args = append(args, opts.RunArgs...)
 	log.Debugf("Running Tarantool with args: %s", strings.Join(args[1:], " "))
 	execErr := syscall.Exec(inst.tarantoolPath, args, newInstanceEnv)

test/integration/run/test_run.py

@@ -79,7 +79,7 @@ def test_running_missing_script(tt_cmd, tmpdir_with_cfg):
         text=True
     )
     run_output = instance_process.stdout.readline()
-    assert re.search(r"was some problem locating script", run_output)
+    assert re.search(r"Can't open script", run_output)
 
 
 def test_running_multi_instance(tt_cmd, tmpdir_with_cfg):