Cleanup when commands are executed in sh or not

cmoog · cmoog · commit 18b5f50abcca · 2020-07-29T12:35:10.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -46,7 +46,7 @@ func init() {
 // write session tokens to the given container runner
 func headlessLogin(ctx context.Context, t *testing.T, runner *tcli.ContainerRunner) {
 	creds := login(ctx, t)
-	cmd := exec.CommandContext(ctx, "mkdir -p ~/.config/coder && cat > ~/.config/coder/session")
+	cmd := exec.CommandContext(ctx, "sh", "-c", "mkdir -p ~/.config/coder && cat > ~/.config/coder/session")
 
 	// !IMPORTANT: be careful that this does not appear in logs
 	cmd.Stdin = strings.NewReader(creds.token)
diff --git a/ci/tcli/doc.go b/ci/tcli/doc.go
@@ -1,4 +1,4 @@
 // Package tcli provides a framework for CLI integration testing.
-// Execute commands on the raw host of inside docker container.
+// Execute commands on the raw host or inside a docker container.
 // Define custom Assertion types to extend test functionality.
 package tcli
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -102,31 +102,48 @@ func (r *ContainerRunner) Close() error {
 	return nil
 }
 
+// Run executes the given command in the runtime container with reasonable defaults.
+// "command" is executed in a shell as an argument to "sh -c".
+func (r *ContainerRunner) Run(ctx context.Context, command string) *Assertable {
+	cmd := exec.CommandContext(ctx,
+		"docker", "exec", "-i", r.name,
+		"sh", "-c", command,
+	)
+
+	return &Assertable{
+		cmd:   cmd,
+		tname: command,
+	}
+}
+
+// RunCmd lifts the given *exec.Cmd into the runtime container
+func (r *ContainerRunner) RunCmd(cmd *exec.Cmd) *Assertable {
+	path, _ := exec.LookPath("docker")
+	cmd.Path = path
+	command := strings.Join(cmd.Args, " ")
+	cmd.Args = append([]string{"docker", "exec", "-i", r.name}, cmd.Args...)
+
+	return &Assertable{
+		cmd:   cmd,
+		tname: command,
+	}
+}
+
 // HostRunner executes command tests on the host, outside of a container
 type HostRunner struct{}
 
-// Run executes the given command on the host
+// Run executes the given command on the host.
+// "command" is executed in a shell as an argument to "sh -c".
 func (r *HostRunner) Run(ctx context.Context, command string) *Assertable {
-	var (
-		args  []string
-		path  string
-		parts = strings.Split(command, " ")
-	)
-	if len(parts) > 0 {
-		path = parts[0]
-	}
-	if len(parts) > 1 {
-		args = parts[1:]
-	}
-	cmd := exec.CommandContext(ctx, path, args...)
+	cmd := exec.CommandContext(ctx, "sh", "-c", command)
 
 	return &Assertable{
 		cmd:   cmd,
 		tname: command,
 	}
 }
 
-// RunCmd executes the given command on the host
+// RunCmd executes the given *exec.Cmd on the host
 func (r *HostRunner) RunCmd(cmd *exec.Cmd) *Assertable {
 	return &Assertable{
 		cmd:   cmd,
@@ -145,32 +162,6 @@ type Assertable struct {
 	tname string
 }
 
-// Run executes the given command in the runtime container with reasonable defaults
-func (r *ContainerRunner) Run(ctx context.Context, command string) *Assertable {
-	cmd := exec.CommandContext(ctx,
-		"docker", "exec", "-i", r.name,
-		"sh", "-c", command,
-	)
-
-	return &Assertable{
-		cmd:   cmd,
-		tname: command,
-	}
-}
-
-// RunCmd lifts the given *exec.Cmd into the runtime container
-func (r *ContainerRunner) RunCmd(cmd *exec.Cmd) *Assertable {
-	path, _ := exec.LookPath("docker")
-	cmd.Path = path
-	command := strings.Join(cmd.Args, " ")
-	cmd.Args = []string{"docker", "exec", "-i", r.name, "sh", "-c", command}
-
-	return &Assertable{
-		cmd:   cmd,
-		tname: command,
-	}
-}
-
 // Assert runs the Assertable and
 func (a Assertable) Assert(t *testing.T, option ...Assertion) {
 	slog.Helper()
