Merge 253e6be into 34e73d9

Author: alexei-led

README.md

@@ -25,6 +25,10 @@ func NewExecCLICommand(ctx context.Context) *cli.Command {
 				Usage: "shell command, that will be sent by Pumba to the target container(s)",
 				Value: "kill 1",
 			},
+			cli.StringSliceFlag{
+				Name:  "args, a",
+				Usage: "additional arguments for the command",
+			},
 			cli.IntFlag{
 				Name:  "limit, l",
 				Usage: "limit number of container to exec (0: exec all matching)",
@@ -47,10 +51,12 @@ func (cmd *execContext) exec(c *cli.Context) error {
 	}
 	// get command
 	command := c.String("command")
+	// get args
+	args := c.StringSlice("args")
 	// get limit for number of containers to exec
 	limit := c.Int("limit")
 	// init exec command
-	execCommand := docker.NewExecCommand(chaos.DockerClient, params, command, limit)
+	execCommand := docker.NewExecCommand(chaos.DockerClient, params, command, args, limit)
 	// run exec command
 	err = chaos.RunChaosCommand(cmd.context, execCommand, params)
 	if err != nil {

pkg/chaos/docker/cmd/exec.go

@@ -16,18 +16,20 @@ type execCommand struct {
 	pattern string
 	labels  []string
 	command string
+	args    []string
 	limit   int
 	dryRun  bool
 }
 
 // NewExecCommand create new Exec Command instance
-func NewExecCommand(client container.Client, params *chaos.GlobalParams, command string, limit int) chaos.Command {
+func NewExecCommand(client container.Client, params *chaos.GlobalParams, command string, args []string, limit int) chaos.Command {
 	exec := &execCommand{
 		client:  client,
 		names:   params.Names,
 		pattern: params.Pattern,
 		labels:  params.Labels,
 		command: command,
+		args:    args,
 		limit:   limit,
 		dryRun:  params.DryRun,
 	}
@@ -66,9 +68,10 @@ func (k *execCommand) Run(ctx context.Context, random bool) error {
 		log.WithFields(log.Fields{
 			"c":       *c,
 			"command": k.command,
+			"args":    k.args,
 		}).Debug("execing c")
 		cc := c
-		err = k.client.ExecContainer(ctx, cc, k.command, k.dryRun)
+		err = k.client.ExecContainer(ctx, cc, k.command, k.args, k.dryRun)
 		if err != nil {
 			return errors.Wrap(err, "failed to run exec command")
 		}

pkg/chaos/docker/exec.go

@@ -18,6 +18,7 @@ func TestExecCommand_Run(t *testing.T) {
 	type fields struct {
 		params  *chaos.GlobalParams
 		command string
+		args    []string
 		limit   int
 	}
 	type args struct {
@@ -38,7 +39,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Names: []string{"c1", "c2"},
 				},
-				command: "kill 1",
+				command: "kill",
+				args:    []string{"-9"},
 			},
 			args: args{
 				ctx: context.TODO(),
@@ -52,7 +54,8 @@ func TestExecCommand_Run(t *testing.T) {
 					Names:  []string{"c1", "c2", "c3"},
 					Labels: []string{"key=value"},
 				},
-				command: "kill 1",
+				command: "ls",
+				args:    []string{"-la"},
 			},
 			args: args{
 				ctx: context.TODO(),
@@ -65,7 +68,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Pattern: "^c?",
 				},
-				command: "kill -STOP 1",
+				command: "kill",
+				args:    []string{"-STOP", "1"},
 				limit:   2,
 			},
 			args: args{
@@ -79,7 +83,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Names: []string{"c1", "c2", "c3"},
 				},
-				command: "kill 1",
+				command: "kill",
+				args:    []string{"1"},
 			},
 			args: args{
 				ctx:    context.TODO(),
@@ -93,7 +98,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Names: []string{"c1", "c2", "c3"},
 				},
-				command: "kill 1",
+				command: "kill",
+				args:    []string{"1"},
 			},
 			args: args{
 				ctx: context.TODO(),
@@ -105,7 +111,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Names: []string{"c1", "c2", "c3"},
 				},
-				command: "kill 1",
+				command: "kill",
+				args:    []string{"1"},
 			},
 			args: args{
 				ctx: context.TODO(),
@@ -119,7 +126,8 @@ func TestExecCommand_Run(t *testing.T) {
 				params: &chaos.GlobalParams{
 					Names: []string{"c1", "c2", "c3"},
 				},
-				command: "kill 1",
+				command: "kill",
+				args:    []string{"1"},
 			},
 			args: args{
 				ctx: context.TODO(),
@@ -138,6 +146,7 @@ func TestExecCommand_Run(t *testing.T) {
 				pattern: tt.fields.params.Pattern,
 				labels:  tt.fields.params.Labels,
 				command: tt.fields.command,
+				args:    tt.fields.args,
 				limit:   tt.fields.limit,
 				dryRun:  tt.fields.params.DryRun,
 			}
@@ -153,11 +162,11 @@ func TestExecCommand_Run(t *testing.T) {
 				}
 			}
 			if tt.args.random {
-				mockClient.On("ExecContainer", tt.args.ctx, mock.AnythingOfType("*container.Container"), tt.fields.command, tt.fields.params.DryRun).Return(nil)
+				mockClient.On("ExecContainer", tt.args.ctx, mock.AnythingOfType("*container.Container"), tt.fields.command, tt.fields.args, tt.fields.params.DryRun).Return(nil)
 			} else {
 				for i := range tt.expected {
 					if tt.fields.limit == 0 || i < tt.fields.limit {
-						call = mockClient.On("ExecContainer", tt.args.ctx, mock.AnythingOfType("*container.Container"), tt.fields.command, tt.fields.params.DryRun)
+						call = mockClient.On("ExecContainer", tt.args.ctx, mock.AnythingOfType("*container.Container"), tt.fields.command, tt.fields.args, tt.fields.params.DryRun)
 						if tt.errs.execError {
 							call.Return(errors.New("ERROR"))
 							goto Invoke

pkg/chaos/docker/exec_test.go

@@ -22,7 +22,7 @@ type Client interface {
 	ListContainers(context.Context, FilterFunc, ListOpts) ([]*Container, error)
 	StopContainer(context.Context, *Container, int, bool) error
 	KillContainer(context.Context, *Container, string, bool) error
-	ExecContainer(context.Context, *Container, string, bool) error
+	ExecContainer(context.Context, *Container, string, []string, bool) error
 	RestartContainer(context.Context, *Container, time.Duration, bool) error
 	RemoveContainer(context.Context, *Container, bool, bool, bool, bool) error
 	NetemContainer(context.Context, *Container, string, []string, []*net.IPNet, []string, []string, time.Duration, string, bool, bool) error