Add command action

Author: bukka

.mockery.yaml

@@ -58,6 +58,11 @@ packages:
       dir: mocks/generated/run/actions/action/bench
     interfaces:
       Maker: {}
+  github.com/wstool/wst/run/actions/action/command:
+    config:
+      dir: mocks/generated/run/actions/action/command
+    interfaces:
+      Maker: {}
   github.com/wstool/wst/run/actions/action/expect:
     config:
       dir: mocks/generated/run/actions/action/expect

TODO.md

@@ -49,7 +49,7 @@ in the future.
 
 #### Structure - Instances, Actions, Servers, Services
 
-- introduce new command action and make it work with output
+- add command expectation for checking its output
 - look into doing some partial expectation
   - some sort of contains mode rather than full match
 - introduce action parameter `on_failure` to set what to do when action fails
@@ -71,6 +71,8 @@ in the future.
 - support metrics server expectation
 - custom server actions for parallel and not action
   - this is mainly for completeness with sequential and might be also useful in some cases
+- add command action custom environment variables support
+  - should be an action map parameter
 - look into default action service integration
   - it should be basically service defined in parent (e.g. sequential service) and used if no service is defined for the action
   - it could be then used in the string form like `expect//name`

conf/parser/factory/functions.go

@@ -57,6 +57,8 @@ func (f *FuncProvider) GetFactoryFunc(funcName string) (Func, error) {
 		return f.createAction, nil
 	case "createActions":
 		return f.createActions, nil
+	case "createCommand":
+		return f.createCommand, nil
 	case "createContainerImage":
 		return f.createContainerImage, nil
 	case "createEnvironments":
@@ -104,6 +106,26 @@ func (f *FuncProvider) createActions(data interface{}, fieldValue reflect.Value,
 	return nil
 }
 
+func (f *FuncProvider) createCommand(data interface{}, fieldValue reflect.Value, path string) error {
+	var command types.Command
+	switch v := data.(type) {
+	case string:
+		command = types.ShellCommand{
+			Command: v,
+		}
+	case []string:
+		command = types.ArgsCommand{
+			Args: v,
+		}
+	default:
+		return errors.Errorf("unsupported type for command data at %s", f.loc.String())
+	}
+
+	fieldValue.Set(reflect.ValueOf(command))
+
+	return nil
+}
+
 func (f *FuncProvider) createContainerImage(data interface{}, fieldValue reflect.Value, path string) error {
 	img := types.ContainerImage{}
 	switch v := data.(type) {

conf/types/action.go

@@ -81,6 +81,26 @@ type MetricsExpectationAction struct {
 	Metrics MetricsExpectation `wst:"metrics"`
 }
 
+type ShellCommand struct {
+	Command string
+}
+
+type ArgsCommand struct {
+	Args []string
+}
+
+type Command interface{}
+
+type CommandAction struct {
+	Service string            `wst:"service"`
+	Timeout int               `wst:"timeout"`
+	When    string            `wst:"when,enum=always|on_success|on_fail,default=on_success"`
+	Id      string            `wst:"id,default=last"`
+	Command Command           `wst:"command,factory=createCommand"`
+	Shell   string            `wst:"shell,default=/bin/sh"`
+	Env     map[string]string `wst:"env"`
+}
+
 type RequestAction struct {
 	Service    string  `wst:"service"`
 	Timeout    int     `wst:"timeout"`