Merge pull request #12 from sbssk8/feature/allow-setting-working-dire…

…ctory

Allow setting working directory

README.md

@@ -37,6 +37,11 @@ Substitutions in args entry in the config file
     - `CreationTimestampSeconds` is the message creation time in seconds _See [examples/ARRAY.md](examples/ARRAY.md) for an example_
 
 
+Set working directory
+---------------------
+
+The working directory of the process can be set with `workingDirectory`.
+
 Execute as a specific user
 --------------------------
 
@@ -121,6 +126,7 @@ cond = [
 cmd = "/usr/local/bin/do-something-with-the-instance"
 args = ["asg=$.AutoScalingGroupName", "instance_id=$.EC2InstanceId"]
 argsjson = true
+workingDirectory = "/path/to/process/wd/"
 ```
 
 

outputs/cmd/cmd.go

@@ -22,13 +22,14 @@ const (
 // Cmd is the command struct that will be executed after recive the order
 // from the input plugins
 type Cmd struct {
-	r                             *lib.Reactor
-	cmd                           string
-	user                          string
-	environment                   []string
-	args                          []string
-	cond                          map[string]*regexp.Regexp
-	maximumCmdTimeLive            time.Duration
+	r                  *lib.Reactor
+	cmd                string
+	user               string
+	workingDirectory   string
+	environment        []string
+	args               []string
+	cond               map[string]*regexp.Regexp
+	maximumCmdTimeLive time.Duration
 }
 
 // NewOrGet create the command struct and fill the parameters needed from the
@@ -50,6 +51,8 @@ func NewOrGet(r *lib.Reactor, c map[string]interface{}) (*Cmd, error) {
 			}
 		case "user":
 			o.user = v.(string)
+		case "workingdirectory":
+			o.workingDirectory = v.(string)
 		case "env":
 			for _, n := range v.([]interface{}) {
 				o.environment = append(o.environment, n.(string))
@@ -182,19 +185,18 @@ func (o *Cmd) Run(rl *lib.ReactorLog, msg lib.Msg) error {
 			return err
 		}
 	}
+	c.Dir = o.workingDirectory
 
 	c.Stdout = rl
 	c.Stderr = rl
 
-
-
 	if err := c.Start(); err != nil {
-		rl.Write([]byte("error starting process " + o.cmd + " " + strings.Join(args, " ") +": " + err.Error()))
+		rl.Write([]byte("error starting process " + o.cmd + " " + strings.Join(args, " ") + ": " + err.Error()))
 		return err
 	}
 
 	pid := c.Process.Pid // Since Start returned correctly, c.Process is not null.
-	rl.Start(pid, o.cmd + " " + strings.Join(args, " "))
+	rl.Start(pid, o.cmd+" "+strings.Join(args, " "))
 
 	if err := c.Wait(); err != nil {
 		rl.Write([]byte("error running process: " + err.Error()))

outputs/cmd/user_unix.go

@@ -1,3 +1,4 @@
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package cmd
@@ -15,7 +16,7 @@ func setUserToCmd(u string, finalEnv []string, c *exec.Cmd) error {
 	if err != nil {
 		return err
 	}
-	c.Env = append(finalEnv)
+	c.Env = append([]string(nil), finalEnv...)
 	c.SysProcAttr = &syscall.SysProcAttr{}
 	c.SysProcAttr.Credential = userCredential
 	setEnvirons(u, finalEnv, c)