Skip to content

Feature/async mixin #2

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

Open
wants to merge 2 commits into
base: feature/directory_param
Choose a base branch
from
Open

Feature/async mixin #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2e5036
allow async execution for mixins
Jul 27, 2022
dcbb8de
Merge branch 'feature/directory_param' into feature/async_mixin
Jul 28, 2022
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
18 changes: 16 additions & 2 deletions pkg/exec/builder/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ type SuppressesOutput interface {
SuppressesOutput() bool
}

type AsyncStep interface {
Async() bool
}

// HasErrorHandling is implemented by mixin commands that want to handle errors
// themselves, and possibly allow failed commands to either pass, or to improve
// the displayed error message
Expand All @@ -67,6 +71,7 @@ type ExitError interface {
// a single step is allowed to be defined in the Action (which is what happens when Porter
// executes steps one at a time).
func ExecuteSingleStepAction(cxt *portercontext.Context, action ExecutableAction) (string, error) {

steps := action.GetSteps()
if len(steps) != 1 {
return "", fmt.Errorf("expected a single step, but got %d", len(steps))
Expand Down Expand Up @@ -100,6 +105,7 @@ func ExecuteSingleStepAction(cxt *portercontext.Context, action ExecutableAction
// ExecuteStep runs the command represented by an ExecutableStep, piping stdout/stderr
// back to the context and returns the buffered output for subsequent processing.
func ExecuteStep(pctx *portercontext.Context, step ExecutableStep) (string, error) {

ctx := context.TODO()

// Identify if any suffix arguments are defined
Expand Down Expand Up @@ -174,12 +180,20 @@ func ExecuteStep(pctx *portercontext.Context, step ExecutableStep) (string, erro
}
}

async := false
asyncStep, ok := step.(AsyncStep)
if ok {
async = asyncStep.Async()
}

err := cmd.Start()
if err != nil {
return "", fmt.Errorf("couldn't run command %s: %w", prettyCmd, err)
}

err = cmd.Wait()
if !async {
// async commands run in the background and do not report any error
err = cmd.Wait()
}

// Check if the command knows how to handle and recover from its own errors
if err != nil {
Expand Down