Merge lp:~thumper/juju-core/run-cmd-refactor into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Refactor RunCommands function into a util package

As part of this work, the return structure has been
moved into the utils/exec package along with the
RunCommands function.

I didn't really like the return structure being in
the cmd package, but I didn't see a better place at
the time of making it.

The biggest part of this restructing is the renaming
of the call sites. A benefit is reduced package
dependencies by the users.

https://codereview.appspot.com/52300043/

Refactor RunCommands function into a util package

As part of this work, the return structure has been
moved into the utils/exec package along with the
RunCommands function.

I didn't really like the return structure being in
the cmd package, but I didn't see a better place at
the time of making it.

The biggest part of this restructing is the renaming
of the call sites. A benefit is reduced package
dependencies by the users.

https://codereview.appspot.com/52300043/

[Tim Penhey (thumper)]

Reviewers: mp+201680_code.launchpad.net,

Message:
Please take a look.

Description:
Refactor RunCommands function into a util package

As part of this work, the return structure has been
moved into the utils/exec package along with the
RunCommands function.

I didn't really like the return structure being in
the cmd package, but I didn't see a better place at
the time of making it.

The biggest part of this restructing is the renaming
of the call sites. A benefit is reduced package
dependencies by the users.

https://code.launchpad.net/~thumper/juju-core/run-cmd-refactor/+merge/201680

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/52300043/

Affected files (+237, -91 lines):
   A [revision details]
   M cmd/juju/run_test.go
   M cmd/jujud/main.go
   M cmd/jujud/run.go
   M cmd/jujud/run_test.go
   D cmd/remote.go
   M state/api/params/internal.go
   M state/apiserver/client/run.go
   M state/apiserver/client/run_test.go
   A utils/exec/exec.go
   A utils/exec/exec_test.go
   A utils/exec/package_test.go
   M utils/ssh/run.go
   M worker/uniter/context.go
   M worker/uniter/jujuc/server.go
   M worker/uniter/jujuc/server_test.go
   M worker/uniter/runlistener.go
   M worker/uniter/runlistener_test.go
   M worker/uniter/uniter.go
   M worker/uniter/uniter_test.go

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/52300043/

[Go Bot (go-bot)]

The attempt to merge lp:~thumper/juju-core/run-cmd-refactor into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.265s
ok launchpad.net/juju-core/agent/tools 0.249s
ok launchpad.net/juju-core/bzr 7.326s
ok launchpad.net/juju-core/cert 3.417s
ok launchpad.net/juju-core/charm 0.566s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.037s
ok launchpad.net/juju-core/cloudinit/sshinit 1.049s
ok launchpad.net/juju-core/cmd 0.253s
ok launchpad.net/juju-core/cmd/charm-admin 0.807s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 190.068s
ok launchpad.net/juju-core/cmd/jujud 60.586s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 3.131s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container 0.040s
ok launchpad.net/juju-core/container/factory 0.074s
ok launchpad.net/juju-core/container/kvm 0.289s
ok launchpad.net/juju-core/container/kvm/mock 0.048s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.403s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.313s
ok launchpad.net/juju-core/environs 3.072s
ok launchpad.net/juju-core/environs/bootstrap 4.542s
ok launchpad.net/juju-core/environs/cloudinit 0.575s
ok launchpad.net/juju-core/environs/config 1.072s
ok launchpad.net/juju-core/environs/configstore 0.061s
ok launchpad.net/juju-core/environs/filestorage 0.033s
ok launchpad.net/juju-core/environs/httpstorage 1.070s
ok launchpad.net/juju-core/environs/imagemetadata 0.531s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.055s
ok launchpad.net/juju-core/environs/jujutest 0.210s
ok launchpad.net/juju-core/environs/manual 12.561s
ok launchpad.net/juju-core/environs/simplestreams 0.337s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.257s
ok launchpad.net/juju-core/environs/storage 1.163s
ok launchpad.net/juju-core/environs/sync 32.002s
ok launchpad.net/juju-core/environs/testing 0.203s
ok launchpad.net/juju-core/environs/tools 6.948s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
ok launchpad.net/juju-core/instance 0.022s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 16.194s
ok launchpad.net/juju-core/juju/osenv 0.017s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.016s
ok launchpad.net/juju-core/log/syslog 0.022s
ok launchpad.net/juju-core/names 0.026s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provi...

=== modified file 'cmd/juju/run_test.go'
--- cmd/juju/run_test.go	2014-01-12 20:38:39 +0000
+++ cmd/juju/run_test.go	2014-01-14 21:31:32 +0000
@@ -13,6 +13,7 @@
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/utils/exec"
 )
 
 type RunSuite struct {
@@ -191,7 +192,7 @@
 		message: "stdout and stderr are base64 encoded if not valid utf8",
 		results: []params.RunResult{
 			params.RunResult{
-				RemoteResponse: cmd.RemoteResponse{
+				ExecResponse: exec.ExecResponse{
 					Stdout: []byte{0xff},
 					Stderr: []byte{0xfe},
 				},
@@ -386,7 +387,7 @@
 
 func makeRunResult(mock mockResponse) params.RunResult {
 	return params.RunResult{
-		RemoteResponse: cmd.RemoteResponse{
+		ExecResponse: exec.ExecResponse{
 			Stdout: []byte(mock.stdout),
 			Stderr: []byte(mock.stderr),
 			Code:   mock.code,

=== modified file 'cmd/jujud/main.go'
--- cmd/jujud/main.go	2013-12-12 22:54:02 +0000
+++ cmd/jujud/main.go	2014-01-14 21:31:32 +0000
@@ -10,6 +10,7 @@
 	"path/filepath"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 
 	// Import the providers.
@@ -76,7 +77,7 @@
 		return
 	}
 	defer client.Close()
-	var resp cmd.RemoteResponse
+	var resp exec.ExecResponse
 	err = client.Call("Jujuc.Main", req, &resp)
 	if err != nil {
 		return

=== modified file 'cmd/jujud/run.go'
--- cmd/jujud/run.go	2013-12-13 04:40:41 +0000
+++ cmd/jujud/run.go	2014-01-14 21:31:32 +0000
@@ -13,6 +13,7 @@
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/names"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/worker/uniter"
 )
 
@@ -96,7 +97,7 @@
 	}
 	defer client.Close()
 
-	var result cmd.RemoteResponse
+	var result exec.ExecResponse
 	err = client.Call(uniter.JujuRunEndpoint, c.commands, &result)
 	if err != nil {
 		return err

=== modified file 'cmd/jujud/run_test.go'
--- cmd/jujud/run_test.go	2013-12-13 03:37:01 +0000
+++ cmd/jujud/run_test.go	2014-01-14 21:31:32 +0000
@@ -15,6 +15,7 @@
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
 	"launchpad.net/juju-core/testing/testbase"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/worker/uniter"
 )
 
@@ -125,9 +126,9 @@
 
 var _ uniter.CommandRunner = (*mockRunner)(nil)
 
-func (r *mockRunner) RunCommands(commands string) (results *cmd.RemoteResponse, err error) {
+func (r *mockRunner) RunCommands(commands string) (results *exec.ExecResponse, err error) {
 	r.c.Log("mock runner: " + commands)
-	return &cmd.RemoteResponse{
+	return &exec.ExecResponse{
 		Code:   42,
 		Stdout: []byte(commands + " stdout"),
 		Stderr: []byte(commands + " stderr"),

=== removed file 'cmd/remote.go'
--- cmd/remote.go	2013-12-12 04:31:01 +0000
+++ cmd/remote.go	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-// Copyright 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package cmd
-
-// RemoteResponse contains the return code and output generated by a remote
-// request.
-type RemoteResponse struct {
-	Code   int
-	Stdout []byte
-	Stderr []byte
-}

=== modified file 'state/api/params/internal.go'
--- state/api/params/internal.go	2014-01-12 20:07:40 +0000
+++ state/api/params/internal.go	2014-01-14 21:31:32 +0000
@@ -6,10 +6,10 @@
 import (
 	"time"
 
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/tools"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/version"
 )
 
@@ -527,7 +527,7 @@
 // RunResult contains the result from an individual run call on a machine.
 // UnitId is populated if the command was run inside the unit context.
 type RunResult struct {
-	cmd.RemoteResponse
+	exec.ExecResponse
 	MachineId string
 	UnitId    string
 	Error     string

=== modified file 'state/apiserver/client/run.go'
--- state/apiserver/client/run.go	2014-01-12 20:28:43 +0000
+++ state/apiserver/client/run.go	2014-01-14 21:31:32 +0000
@@ -150,9 +150,9 @@
 			response, err := ssh.ExecuteCommandOnMachine(param.ExecParams)
 			logger.Debugf("reponse from %s: %v (err:%v)", param.MachineId, response, err)
 			execResponse := params.RunResult{
-				RemoteResponse: response,
-				MachineId:      param.MachineId,
-				UnitId:         param.UnitId,
+				ExecResponse: response,
+				MachineId:    param.MachineId,
+				UnitId:       param.UnitId,
 			}
 			if err != nil {
 				execResponse.Error = fmt.Sprint(err)

=== modified file 'state/apiserver/client/run_test.go'
--- state/apiserver/client/run_test.go	2014-01-12 20:28:43 +0000
+++ state/apiserver/client/run_test.go	2014-01-14 21:31:32 +0000
@@ -12,13 +12,13 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/client"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/utils/ssh"
 )
 
@@ -230,8 +230,8 @@
 	for i := 0; i < 3; i++ {
 		expectedResults = append(expectedResults,
 			params.RunResult{
-				RemoteResponse: cmd.RemoteResponse{Stdout: []byte("hostname\n")},
-				MachineId:      fmt.Sprint(i),
+				ExecResponse: exec.ExecResponse{Stdout: []byte("hostname\n")},
+				MachineId:    fmt.Sprint(i),
 			})
 	}
 
@@ -264,18 +264,18 @@
 	c.Assert(results, gc.HasLen, 3)
 	expectedResults := []params.RunResult{
 		params.RunResult{
-			RemoteResponse: cmd.RemoteResponse{Stdout: []byte("hostname\n")},
-			MachineId:      "0",
-		},
-		params.RunResult{
-			RemoteResponse: cmd.RemoteResponse{Stdout: []byte("juju-run magic/0 'hostname'\n")},
-			MachineId:      "1",
-			UnitId:         "magic/0",
-		},
-		params.RunResult{
-			RemoteResponse: cmd.RemoteResponse{Stdout: []byte("juju-run magic/1 'hostname'\n")},
-			MachineId:      "2",
-			UnitId:         "magic/1",
+			ExecResponse: exec.ExecResponse{Stdout: []byte("hostname\n")},
+			MachineId:    "0",
+		},
+		params.RunResult{
+			ExecResponse: exec.ExecResponse{Stdout: []byte("juju-run magic/0 'hostname'\n")},
+			MachineId:    "1",
+			UnitId:       "magic/0",
+		},
+		params.RunResult{
+			ExecResponse: exec.ExecResponse{Stdout: []byte("juju-run magic/1 'hostname'\n")},
+			MachineId:    "2",
+			UnitId:       "magic/1",
 		},
 	}
 

=== added directory 'utils/exec'
=== added file 'utils/exec/exec.go'
--- utils/exec/exec.go	1970-01-01 00:00:00 +0000
+++ utils/exec/exec.go	2014-01-14 21:31:32 +0000
@@ -0,0 +1,73 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package exec
+
+import (
+	"bytes"
+	"os/exec"
+	"syscall"
+
+	"launchpad.net/loggo"
+)
+
+var logger = loggo.GetLogger("juju.util.exec")
+
+// Parameters for RunCommands.  Commands contains one or more commands to be
+// executed using '/bin/bash -s'.  If WorkingDir is set, this is passed
+// through to bash.  Similarly if the Environment is specified, this is used
+// for executing the command.
+type RunParams struct {
+	Commands    string
+	WorkingDir  string
+	Environment []string
+}
+
+// ExecResponse contains the return code and output generated by executing a
+// command.
+type ExecResponse struct {
+	Code   int
+	Stdout []byte
+	Stderr []byte
+}
+
+// RunCommands executes the Commands specified in the RunParams using
+// '/bin/bash -s', passing the commands through as stdin, and collecting
+// stdout and stderr.  If a non-zero return code is returned, this is
+// collected as the code for the response and this does not classify as an
+// error.
+func RunCommands(run RunParams) (*ExecResponse, error) {
+	ps := exec.Command("/bin/bash", "-s")
+	if run.Environment != nil {
+		ps.Env = run.Environment
+	}
+	if run.WorkingDir != "" {
+		ps.Dir = run.WorkingDir
+	}
+	ps.Stdin = bytes.NewBufferString(run.Commands)
+
+	stdout := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+
+	ps.Stdout = stdout
+	ps.Stderr = stderr
+
+	err := ps.Start()
+	if err == nil {
+		err = ps.Wait()
+	}
+	result := &ExecResponse{
+		Stdout: stdout.Bytes(),
+		Stderr: stderr.Bytes(),
+	}
+	if ee, ok := err.(*exec.ExitError); ok && err != nil {
+		status := ee.ProcessState.Sys().(syscall.WaitStatus)
+		if status.Exited() {
+			// A non-zero return code isn't considered an error here.
+			result.Code = status.ExitStatus()
+			err = nil
+		}
+		logger.Infof("run result: %v", ee)
+	}
+	return result, err
+}

=== added file 'utils/exec/exec_test.go'
--- utils/exec/exec_test.go	1970-01-01 00:00:00 +0000
+++ utils/exec/exec_test.go	2014-01-14 21:31:32 +0000
@@ -0,0 +1,82 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package exec_test
+
+import (
+	gc "launchpad.net/gocheck"
+
+	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
+	"launchpad.net/juju-core/utils/exec"
+)
+
+type execSuite struct {
+	testbase.LoggingSuite
+}
+
+var _ = gc.Suite(&execSuite{})
+
+func (*execSuite) TestRunCommands(c *gc.C) {
+	newDir := c.MkDir()
+
+	for i, test := range []struct {
+		message     string
+		commands    string
+		workingDir  string
+		environment []string
+		stdout      string
+		stderr      string
+		code        int
+	}{
+		{
+			message:  "test stdout capture",
+			commands: "echo testing stdout",
+			stdout:   "testing stdout\n",
+		}, {
+			message:  "test stderr capture",
+			commands: "echo testing stderr >&2",
+			stderr:   "testing stderr\n",
+		}, {
+			message:  "test return code",
+			commands: "exit 42",
+			code:     42,
+		}, {
+			message:    "test working dir",
+			commands:   "pwd",
+			workingDir: newDir,
+			stdout:     newDir + "\n",
+		}, {
+			message:     "test environment",
+			commands:    "echo $OMG_IT_WORKS",
+			environment: []string{"OMG_IT_WORKS=like magic"},
+			stdout:      "like magic\n",
+		},
+	} {
+		c.Logf("%v: %s", i, test.message)
+
+		result, err := exec.RunCommands(
+			exec.RunParams{
+				Commands:    test.commands,
+				WorkingDir:  test.workingDir,
+				Environment: test.environment,
+			})
+		c.Assert(err, gc.IsNil)
+		c.Assert(string(result.Stdout), gc.Equals, test.stdout)
+		c.Assert(string(result.Stderr), gc.Equals, test.stderr)
+		c.Assert(result.Code, gc.Equals, test.code)
+	}
+}
+
+func (*execSuite) TestExecUnknownCommand(c *gc.C) {
+	result, err := exec.RunCommands(
+		exec.RunParams{
+			Commands: "unknown-command",
+		},
+	)
+	c.Assert(err, gc.IsNil)
+	c.Assert(result.Stdout, gc.HasLen, 0)
+	c.Assert(string(result.Stderr), jc.Contains, "unknown-command: command not found")
+	// 127 is a special bash return code meaning command not found.
+	c.Assert(result.Code, gc.Equals, 127)
+}

=== added file 'utils/exec/package_test.go'
--- utils/exec/package_test.go	1970-01-01 00:00:00 +0000
+++ utils/exec/package_test.go	2014-01-14 21:31:32 +0000
@@ -0,0 +1,24 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package exec_test
+
+import (
+	"testing"
+
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/testing/testbase"
+)
+
+func Test(t *testing.T) { gc.TestingT(t) }
+
+type Dependencies struct{}
+
+var _ = gc.Suite(&Dependencies{})
+
+func (*Dependencies) TestPackageDependencies(c *gc.C) {
+	// This test is to ensure we don't bring in dependencies without thinking.
+	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/utils/exec"),
+		gc.HasLen, 0)
+}

=== modified file 'utils/ssh/run.go'
--- utils/ssh/run.go	2014-01-10 01:57:51 +0000
+++ utils/ssh/run.go	2014-01-14 21:31:32 +0000
@@ -11,7 +11,7 @@
 	"syscall"
 	"time"
 
-	"launchpad.net/juju-core/cmd"
+	utilexec "launchpad.net/juju-core/utils/exec"
 )
 
 // ExecParams are used for the parameters for ExecuteCommandOnMachine.
@@ -27,7 +27,7 @@
 // through /bin/bash.  If the command is not finished within the timeout
 // specified, an error is returned.  Any output captured during that time
 // is also returned in the remote response.
-func ExecuteCommandOnMachine(params ExecParams) (result cmd.RemoteResponse, err error) {
+func ExecuteCommandOnMachine(params ExecParams) (result utilexec.ExecResponse, err error) {
 	// execute bash accepting commands on stdin
 	if params.Host == "" {
 		return result, fmt.Errorf("missing host address")

=== modified file 'worker/uniter/context.go'
--- worker/uniter/context.go	2013-12-13 03:01:21 +0000
+++ worker/uniter/context.go	2014-01-14 21:31:32 +0000
@@ -5,7 +5,6 @@
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -14,13 +13,12 @@
 	"sort"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/api/uniter"
+	utilexec "launchpad.net/juju-core/utils/exec"
 	unitdebug "launchpad.net/juju-core/worker/uniter/debug"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 )
@@ -212,9 +210,13 @@
 
 // RunCommands executes the commands in an environment which allows it to to
 // call back into the hook context to execute jujuc tools.
-func (ctx *HookContext) RunCommands(commands, charmDir, toolsDir, socketPath string) (*cmd.RemoteResponse, error) {
+func (ctx *HookContext) RunCommands(commands, charmDir, toolsDir, socketPath string) (*utilexec.ExecResponse, error) {
 	env := ctx.hookVars(charmDir, toolsDir, socketPath)
-	result, err := runCommands(commands, charmDir, env)
+	result, err := utilexec.RunCommands(
+		utilexec.RunParams{
+			Commands:    commands,
+			WorkingDir:  charmDir,
+			Environment: env})
 	return result, ctx.finalizeContext("run commands", err)
 }
 
@@ -264,38 +266,6 @@
 	return err
 }
 
-func runCommands(commands, charmDir string, env []string) (*cmd.RemoteResponse, error) {
-	ps := exec.Command("/bin/bash", "-s")
-	ps.Env = env
-	ps.Dir = charmDir
-	ps.Stdin = bytes.NewBufferString(commands)
-
-	stdout := &bytes.Buffer{}
-	stderr := &bytes.Buffer{}
-
-	ps.Stdout = stdout
-	ps.Stderr = stderr
-
-	err := ps.Start()
-	if err == nil {
-		err = ps.Wait()
-	}
-	result := &cmd.RemoteResponse{
-		Stdout: stdout.Bytes(),
-		Stderr: stderr.Bytes(),
-	}
-	if ee, ok := err.(*exec.ExitError); ok && err != nil {
-		status := ee.ProcessState.Sys().(syscall.WaitStatus)
-		if status.Exited() {
-			// A non-zero return code isn't considered an error here.
-			result.Code = status.ExitStatus()
-			err = nil
-		}
-		logger.Infof("run result: %v", ee)
-	}
-	return result, err
-}
-
 type hookLogger struct {
 	r       io.ReadCloser
 	done    chan struct{}

=== modified file 'worker/uniter/jujuc/server.go'
--- worker/uniter/jujuc/server.go	2013-12-12 04:31:01 +0000
+++ worker/uniter/jujuc/server.go	2014-01-14 21:31:32 +0000
@@ -18,6 +18,7 @@
 	"launchpad.net/loggo"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/utils/exec"
 )
 
 var logger = loggo.GetLogger("worker.uniter.jujuc")
@@ -79,7 +80,7 @@
 
 // Main runs the Command specified by req, and fills in resp. A single command
 // is run at a time.
-func (j *Jujuc) Main(req Request, resp *cmd.RemoteResponse) error {
+func (j *Jujuc) Main(req Request, resp *exec.ExecResponse) error {
 	if req.CommandName == "" {
 		return badReqErrorf("command not specified")
 	}

=== modified file 'worker/uniter/jujuc/server_test.go'
--- worker/uniter/jujuc/server_test.go	2013-12-12 04:31:01 +0000
+++ worker/uniter/jujuc/server_test.go	2014-01-14 21:31:32 +0000
@@ -20,6 +20,7 @@
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
 	"launchpad.net/juju-core/testing/testbase"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 )
 
@@ -97,7 +98,7 @@
 	s.LoggingSuite.TearDownTest(c)
 }
 
-func (s *ServerSuite) Call(c *gc.C, req jujuc.Request) (resp cmd.RemoteResponse, err error) {
+func (s *ServerSuite) Call(c *gc.C, req jujuc.Request) (resp exec.ExecResponse, err error) {
 	client, err := rpc.Dial("unix", s.sockPath)
 	c.Assert(err, gc.IsNil)
 	defer client.Close()
@@ -162,7 +163,7 @@
 	c.Assert(err, gc.ErrorMatches, `bad request: unknown context "whatever"`)
 }
 
-func (s *ServerSuite) AssertBadCommand(c *gc.C, args []string, code int) cmd.RemoteResponse {
+func (s *ServerSuite) AssertBadCommand(c *gc.C, args []string, code int) exec.ExecResponse {
 	resp, err := s.Call(c, jujuc.Request{"validCtx", c.MkDir(), args[0], args[1:]})
 	c.Assert(err, gc.IsNil)
 	c.Assert(resp.Code, gc.Equals, code)

=== modified file 'worker/uniter/runlistener.go'
--- worker/uniter/runlistener.go	2013-12-13 02:41:10 +0000
+++ worker/uniter/runlistener.go	2014-01-14 21:31:32 +0000
@@ -11,16 +11,16 @@
 	"net/rpc"
 	"sync"
 
-	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/utils/exec"
 )
 
 const JujuRunEndpoint = "JujuRunServer.RunCommands"
 
 // A CommandRunner is something that will actually execute the commands and
-// return the results of that execution in the cmd.RemoteResponse (which
+// return the results of that execution in the exec.ExecResponse (which
 // contains stdout, stderr, and return code).
 type CommandRunner interface {
-	RunCommands(commands string) (results *cmd.RemoteResponse, err error)
+	RunCommands(commands string) (results *exec.ExecResponse, err error)
 }
 
 // RunListener is responsible for listening on the network connection and
@@ -42,7 +42,7 @@
 
 // RunCommands delegates the actual running to the runner and populates the
 // response structure.
-func (r *JujuRunServer) RunCommands(commands string, result *cmd.RemoteResponse) error {
+func (r *JujuRunServer) RunCommands(commands string, result *exec.ExecResponse) error {
 	logger.Debugf("RunCommands: %q", commands)
 	runResult, err := r.runner.RunCommands(commands)
 	*result = *runResult

=== modified file 'worker/uniter/runlistener_test.go'
--- worker/uniter/runlistener_test.go	2013-12-13 02:41:10 +0000
+++ worker/uniter/runlistener_test.go	2014-01-14 21:31:32 +0000
@@ -9,8 +9,8 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing/testbase"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/worker/uniter"
 )
 
@@ -49,7 +49,7 @@
 	c.Assert(err, gc.IsNil)
 	defer client.Close()
 
-	var result cmd.RemoteResponse
+	var result exec.ExecResponse
 	err = client.Call(uniter.JujuRunEndpoint, "some-command", &result)
 	c.Assert(err, gc.IsNil)
 
@@ -64,9 +64,9 @@
 
 var _ uniter.CommandRunner = (*mockRunner)(nil)
 
-func (r *mockRunner) RunCommands(commands string) (results *cmd.RemoteResponse, err error) {
+func (r *mockRunner) RunCommands(commands string) (results *exec.ExecResponse, err error) {
 	r.c.Log("mock runner: " + commands)
-	return &cmd.RemoteResponse{
+	return &exec.ExecResponse{
 		Code:   42,
 		Stdout: []byte(commands + " stdout"),
 		Stderr: []byte(commands + " stderr"),

=== modified file 'worker/uniter/uniter.go'
--- worker/uniter/uniter.go	2014-01-03 15:34:52 +0000
+++ worker/uniter/uniter.go	2014-01-14 21:31:32 +0000
@@ -23,6 +23,7 @@
 	"launchpad.net/juju-core/state/api/uniter"
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/utils"
+	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/utils/fslock"
 	"launchpad.net/juju-core/worker/uniter/charm"
 	"launchpad.net/juju-core/worker/uniter/hook"
@@ -365,7 +366,7 @@
 }
 
 // RunCommands executes the supplied commands in a hook context.
-func (u *Uniter) RunCommands(commands string) (results *cmd.RemoteResponse, err error) {
+func (u *Uniter) RunCommands(commands string) (results *exec.ExecResponse, err error) {
 	logger.Tracef("run commands: %s", commands)
 	hctxId := fmt.Sprintf("%s:run-commands:%d", u.unit.Name(), u.rand.Int63())
 	lockMessage := fmt.Sprintf("%s: running commands", u.unit.Name())

=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2014-01-14 14:36:31 +0000
+++ worker/uniter/uniter_test.go	2014-01-14 21:31:32 +0000
@@ -25,7 +25,6 @@
 
 	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -35,6 +34,7 @@
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
 	"launchpad.net/juju-core/utils"
+	utilexec "launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/utils/fslock"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/juju-core/worker/uniter"
@@ -1963,7 +1963,7 @@
 		c.Assert(err, gc.IsNil)
 		defer client.Close()
 
-		var result cmd.RemoteResponse
+		var result utilexec.ExecResponse
 		err = client.Call(uniter.JujuRunEndpoint, commands, &result)
 		c.Assert(err, gc.IsNil)
 		c.Check(result.Code, gc.Equals, 0)