Skip to content

[*] run PROGRAM task for all parameters, fixes #741 #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pashagolub merged 1 commit into from
Jan 20, 2026
Merged

[*] run PROGRAM task for all parameters, fixes #741 #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions internal/scheduler/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ var Cmd commander = realCommander{}

// ExecuteProgramCommand executes program command and returns status code, output and error if any
func (sch *Scheduler) ExecuteProgramCommand(ctx context.Context, task *pgengine.ChainTask, paramValues []string) error {

var err error
var exitCode int
command := strings.TrimSpace(task.Command)
if command == "" {
return errors.New("program command cannot be empty")
Expand All @@ -37,24 +38,22 @@ func (sch *Scheduler) ExecuteProgramCommand(ctx context.Context, task *pgengine.
paramValues = []string{""}
}
for _, val := range paramValues {
exitCode = 0
params := []string{}
if val > "" {
if err := json.Unmarshal([]byte(val), &params); err != nil {
return err
}
}
out, err := Cmd.CombinedOutput(ctx, command, params...) // #nosec
if err != nil {
//check if we're dealing with an ExitError - i.e. return code other than 0
out, e := Cmd.CombinedOutput(ctx, command, params...) // #nosec
if e != nil {
exitCode = -1
err = errors.Join(err, e) // accumulate errors for all param sets
if exitError, ok := err.(*exec.ExitError); ok {
exitCode := exitError.ExitCode()
sch.pgengine.LogTaskExecution(context.Background(), task, exitCode, string(out), val)
return exitError
exitCode = exitError.ExitCode()
}
sch.pgengine.LogTaskExecution(context.Background(), task, -1, string(out), val)
return err
}
sch.pgengine.LogTaskExecution(context.Background(), task, 0, string(out), val)
sch.pgengine.LogTaskExecution(context.Background(), task, exitCode, string(out), val)
}
return nil
return err
}
29 changes: 15 additions & 14 deletions internal/scheduler/shell_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scheduler_test
import (
"context"
"encoding/json"
"errors"
"fmt"
"os/exec"
"strings"
Expand Down Expand Up @@ -32,37 +33,37 @@ func TestShellCommand(t *testing.T) {

mock, err := pgxmock.NewPool() //
assert.NoError(t, err)
pge := pgengine.NewDB(mock, "scheduler_unit_test")
scheduler := scheduler.New(pge, log.Init(config.LoggingOpts{LogLevel: "panic", LogDBLevel: "none"}))
pge := pgengine.NewDB(mock, "--log-database-level=none")
sch := scheduler.New(pge, log.Init(config.LoggingOpts{LogLevel: "panic", LogDBLevel: "none"}))
ctx := context.Background()

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{}, []string{""})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{}, []string{""})
assert.EqualError(t, err, "program command cannot be empty", "Empty command should out, fail")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping0"}, nil)
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping0"}, nil)
assert.NoError(t, err, "Command with nil param is out, OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping1"}, []string{})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping1"}, []string{})
assert.NoError(t, err, "Command with empty array param is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping2"}, []string{""})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping2"}, []string{""})
assert.NoError(t, err, "Command with empty string param is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping3"}, []string{"[]"})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping3"}, []string{"[]"})
assert.NoError(t, err, "Command with empty json array param is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping3"}, []string{"[null]"})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping3"}, []string{"[null]"})
assert.NoError(t, err, "Command with nil array param is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping4"}, []string{`["localhost"]`})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping4"}, []string{`["localhost"]`})
assert.NoError(t, err, "Command with one param is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping5"}, []string{`["localhost", "-4"]`})
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping5"}, []string{`["localhost", "-4"]`})
assert.NoError(t, err, "Command with many params is OK")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "pong"}, nil)
assert.IsType(t, (*exec.Error)(nil), err, "Uknown command should produce error")
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "pong"}, nil)
assert.True(t, errors.Is(err, exec.ErrNotFound), "Unknown command should produce exec.Error")

err = scheduler.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping5"}, []string{`{"param1": "localhost"}`})
assert.IsType(t, (*json.UnmarshalTypeError)(nil), err, "Command should fail with mailformed json parameter")
err = sch.ExecuteProgramCommand(ctx, &pgengine.ChainTask{Command: "ping5"}, []string{`{"param1": "localhost"}`})
assert.IsType(t, (*json.UnmarshalTypeError)(nil), err, "Command should fail with malformed json parameter")
}
2 changes: 1 addition & 1 deletion internal/scheduler/tasks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
func TestExecuteTask(t *testing.T) {
mock, err := pgxmock.NewPool() //
assert.NoError(t, err)
pge := pgengine.NewDB(mock, "scheduler_unit_test")
pge := pgengine.NewDB(mock, "--log-database-level=none")
mocksch := New(pge, log.Init(config.LoggingOpts{LogLevel: "panic", LogDBLevel: "none"}))

et := func(task string, params []string) (err error) {
Expand Down
Loading