Rename action command to execute

Author: bukka

.mockery.yaml

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

conf/types/action.go

@@ -92,7 +92,7 @@ type ArgsCommand struct {
 
 type Command interface{}
 
-type CommandAction struct {
+type ExecuteAction struct {
 	Service        string            `wst:"service"`
 	Timeout        int               `wst:"timeout"`
 	When           string            `wst:"when,enum=always|on_success|on_fail,default=on_success"`

mocks/generated/run/actions/action/command/mock_Maker.go

@@ -1,4 +1,4 @@
-package command
+package execute
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 
 type Maker interface {
 	Make(
-		config *types.CommandAction,
+		config *types.ExecuteAction,
 		sl services.ServiceLocator,
 		defaultTimeout int,
 	) (action.Action, error)
@@ -35,7 +35,7 @@ func CreateActionMaker(fnd app.Foundation) *ActionMaker {
 }
 
 func (m *ActionMaker) Make(
-	config *types.CommandAction,
+	config *types.ExecuteAction,
 	sl services.ServiceLocator,
 	defaultTimeout int,
 ) (action.Action, error) {
@@ -126,7 +126,7 @@ func (a *Action) renderCommand() (*environment.Command, error) {
 }
 
 func (a *Action) Execute(ctx context.Context, runData runtime.Data) (bool, error) {
-	a.fnd.Logger().Infof("Executing command action")
+	a.fnd.Logger().Infof("Executing execute action")
 
 	// Send the request.
 	oc := a.outputMaker.MakeCollector(fmt.Sprintf("action %s", a.id))

run/actions/action/command/command.go run/actions/action/execute/execute.gorun/actions/action/command/command.go renamed to run/actions/action/execute/execute.go

@@ -1,4 +1,4 @@
-package command
+package execute
 
 import (
 	"context"
@@ -43,7 +43,7 @@ func TestCreateActionMaker(t *testing.T) {
 func TestActionMaker_Make(t *testing.T) {
 	tests := []struct {
 		name              string
-		config            *types.CommandAction
+		config            *types.ExecuteAction
 		defaultTimeout    int
 		setupMocks        func(*testing.T, *servicesMocks.MockServiceLocator) services.Service
 		getExpectedAction func(*appMocks.MockFoundation, services.Service, output.Maker) *Action
@@ -52,7 +52,7 @@ func TestActionMaker_Make(t *testing.T) {
 	}{
 		{
 			name: "successful shell command creation with default timeout",
-			config: &types.CommandAction{
+			config: &types.ExecuteAction{
 				Service: "validService",
 				Shell:   "/bin/bash",
 				Command: &types.ShellCommand{
@@ -86,7 +86,7 @@ func TestActionMaker_Make(t *testing.T) {
 		},
 		{
 			name: "successful args command creation with config timeout",
-			config: &types.CommandAction{
+			config: &types.ExecuteAction{
 				Service: "validService",
 				Command: &types.ArgsCommand{
 					Args: []string{"ls", "-la"},
@@ -119,7 +119,7 @@ func TestActionMaker_Make(t *testing.T) {
 		},
 		{
 			name: "failure - service not found",
-			config: &types.CommandAction{
+			config: &types.ExecuteAction{
 				Service: "invalidService",
 				Command: &types.ArgsCommand{
 					Args: []string{"ls"},
@@ -135,7 +135,7 @@ func TestActionMaker_Make(t *testing.T) {
 		},
 		{
 			name: "failure - empty args command",
-			config: &types.CommandAction{
+			config: &types.ExecuteAction{
 				Service: "validService",
 				Command: &types.ArgsCommand{
 					Args: []string{},
@@ -152,7 +152,7 @@ func TestActionMaker_Make(t *testing.T) {
 		},
 		{
 			name: "failure - unsupported command type",
-			config: &types.CommandAction{
+			config: &types.ExecuteAction{
 				Service: "validService",
 				Command: &struct{}{}, // some arbitrary struct that doesn't implement known command types
 			},

…n/actions/action/command/command_test.go …n/actions/action/execute/execute_test.gorun/actions/action/command/command_test.go renamed to run/actions/action/execute/execute_test.go run/actions/action/command/command_test.go renamed to run/actions/action/execute/execute_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/wstool/wst/conf/types"
 	"github.com/wstool/wst/run/actions/action"
 	"github.com/wstool/wst/run/actions/action/bench"
-	"github.com/wstool/wst/run/actions/action/command"
+	"github.com/wstool/wst/run/actions/action/execute"
 	"github.com/wstool/wst/run/actions/action/expect"
 	"github.com/wstool/wst/run/actions/action/not"
 	"github.com/wstool/wst/run/actions/action/parallel"
@@ -44,7 +44,7 @@ type nativeActionMaker struct {
 	fnd             app.Foundation
 	runtimeMaker    runtime.Maker
 	benchMaker      bench.Maker
-	commandMaker    command.Maker
+	executeMaker    execute.Maker
 	expectMaker     expect.Maker
 	notMaker        not.Maker
 	parallelMaker   parallel.Maker
@@ -66,7 +66,7 @@ func CreateActionMaker(
 		fnd:             fnd,
 		runtimeMaker:    runtimeMaker,
 		benchMaker:      bench.CreateActionMaker(fnd),
-		commandMaker:    command.CreateActionMaker(fnd),
+		executeMaker:    execute.CreateActionMaker(fnd),
 		expectMaker:     expect.CreateExpectationActionMaker(fnd, expectationsMaker, parametersMaker),
 		notMaker:        not.CreateActionMaker(fnd, runtimeMaker),
 		parallelMaker:   parallel.CreateActionMaker(fnd, runtimeMaker),
@@ -87,8 +87,8 @@ func (m *nativeActionMaker) MakeAction(
 	switch action := config.(type) {
 	case *types.BenchAction:
 		return m.benchMaker.Make(action, sl, defaultTimeout)
-	case *types.CommandAction:
-		return m.commandMaker.Make(action, sl, defaultTimeout)
+	case *types.ExecuteAction:
+		return m.executeMaker.Make(action, sl, defaultTimeout)
 	case *types.CustomExpectationAction:
 		return m.expectMaker.MakeCustomAction(action, sl, defaultTimeout)
 	case *types.MetricsExpectationAction: