refactor

Author: evgeniy-scherbina

cli/cli.go

@@ -223,11 +223,6 @@ func Run(ctx context.Context, config Config, args []string) error {
 	go func() {
 		defer cancel()
 		cmd := boundaryInstance.Command(os.Args)
-		cmd.Env = append(cmd.Env, "CHILD=true")
-		cmd.Env = append(cmd.Env, fmt.Sprintf("VETH_JAIL_NAME=%v", boundaryInstance.GetNetworkConfiguration().VethJailName))
-		cmd.Stderr = os.Stderr
-		cmd.Stdout = os.Stdout
-		cmd.Stdin = os.Stdin
 
 		logger.Debug("Executing command in boundary", "command", strings.Join(os.Args, " "))
 		err := cmd.Start()

e2e_tests/boundary_integration_test.go

@@ -69,7 +69,7 @@ func TestBoundaryIntegration(t *testing.T) {
 		"--allow", "jsonplaceholder.typicode.com",
 		"--log-level", "debug",
 		//"--", "/bin/bash")
-		"--", "/bin/bash", "-c", "/usr/bin/sleep 20 && /usr/bin/echo 'Test completed'")
+		"--", "/bin/bash", "-c", "/usr/bin/sleep 12 && /usr/bin/echo 'Test completed'")
 
 	boundaryCmd.Stdin = os.Stdin
 	boundaryCmd.Stdout = os.Stdout

jail/linux.go

@@ -69,6 +69,10 @@ func (l *LinuxJail) Command(command []string) *exec.Cmd {
 	cmd := exec.Command(command[0], command[1:]...)
 	cmd.Env = l.commandEnv
 	cmd.Env = append(cmd.Env, "CHILD=true")
+	cmd.Env = append(cmd.Env, fmt.Sprintf("VETH_JAIL_NAME=%v", l.vethJailName))
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stdout
+	cmd.Stdin = os.Stdin
 
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Cloneflags: syscall.CLONE_NEWUSER | syscall.CLONE_NEWNET,