feat: add xargs command

Author: FabianKramm

e2e/tests/pipelines/pipelines.go

@@ -52,7 +52,7 @@ var _ = DevSpaceDescribe("portforward", func() {
 		framework.ExpectLocalFileContentsImmediately("test.txt", "Hello World!\n")
 	})
 
-	ginkgo.It("should exec container", func() {
+	ginkgo.It("should watch files", func() {
 		tempDir, err := framework.CopyToTempDir("tests/pipelines/testdata/watch")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)

e2e/tests/pipelines/testdata/watch/devspace.yaml

@@ -14,7 +14,12 @@ pipelines:
       - run: |-
           echo "Hello World" >> test2.yaml
 
+  other3:
+    steps:
+      - run: |-
+          echo "other other2" | xargs run_pipelines
+
   dev:
     steps:
       - run: |-
-          watch -p *.txt -- run_pipelines other other2
+          watch -p *.txt -- run_pipelines other3

pkg/devspace/pipeline/engine/pipelinehandler/commands/watch.go

@@ -6,13 +6,11 @@ import (
 	"github.com/bmatcuk/doublestar"
 	"github.com/jessevdk/go-flags"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
-	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
+	types2 "github.com/loft-sh/devspace/pkg/devspace/pipeline/engine/types"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/tomb"
 	"github.com/loft-sh/notify"
 	"github.com/pkg/errors"
-	"mvdan.cc/sh/v3/interp"
 	"os"
 	"path/filepath"
 	"strings"
@@ -25,7 +23,7 @@ type WatchOptions struct {
 	Paths []string `long:"path" short:"p" description:"The paths to watch. Can be patterns in the form of ./**/my-file.txt"`
 }
 
-func Watch(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string, newHandler NewHandlerFn) error {
+func Watch(devCtx *devspacecontext.Context, args []string, handler types2.ExecHandler) error {
 	devCtx.Log.Debugf("watch %s", strings.Join(args, " "))
 	options := &WatchOptions{}
 	args, err := flags.ParseArgs(options, args)
@@ -40,11 +38,8 @@ func Watch(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []stri
 	}
 
 	w := &watcher{}
-	hc := interp.HandlerCtx(devCtx.Context)
 	return w.Watch(devCtx.Context, options.Paths, options.FailOnError, func(ctx context.Context) error {
-		devCtx := devCtx.WithContext(ctx)
-		_, err := engine.ExecutePipelineShellCommand(ctx, args[0]+" $@", args[1:], hc.Dir, false, hc.Stdout, hc.Stderr, hc.Stdin, hc.Env, newHandler(devCtx, hc.Stdout, pipeline))
-		return err
+		return handler.ExecHandler(ctx, args)
 	}, devCtx.Log)
 }
 

pkg/devspace/pipeline/engine/pipelinehandler/commands/xargs.go

@@ -0,0 +1,77 @@
+package commands
+
+import (
+	"errors"
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine/types"
+	"io/ioutil"
+	"mvdan.cc/sh/v3/interp"
+	"strings"
+)
+
+var xArgsUsage = errors.New(`usage:  xargs [utility [argument ...]]`)
+
+type XArgsOptions struct {
+	Delimiter string
+}
+
+func XArgs(devCtx *devspacecontext.Context, args []string, handler types.ExecHandler) error {
+	options := &XArgsOptions{
+		Delimiter: " ",
+	}
+
+	args, err := parseXArgsOptions(args, options)
+	if err != nil {
+		return err
+	} else if len(args) == 0 {
+		return xArgsUsage
+	}
+
+	hc := interp.HandlerCtx(devCtx.Context)
+	out, err := ioutil.ReadAll(hc.Stdin)
+	if err != nil {
+		return err
+	}
+
+	addArgs := strings.Split(string(out), options.Delimiter)
+	for _, addArg := range addArgs {
+		addArg = strings.TrimSpace(addArg)
+		if addArg == "" {
+			continue
+		}
+
+		args = append(args, addArg)
+	}
+	return handler.ExecHandler(devCtx.Context, args)
+}
+
+func parseXArgsOptions(args []string, options *XArgsOptions) ([]string, error) {
+	// check args for flags
+	startAt := 0
+	for i := 0; i < len(args); i++ {
+		arg := args[i]
+		if len(arg) > 0 && arg[0] == '-' {
+			startAt++
+			arg = arg[1:]
+
+			switch arg {
+			case "d", "-delimiter":
+				if i+1 == len(args) {
+					return nil, xArgsUsage
+				}
+
+				i++
+				startAt++
+				options.Delimiter = args[i]
+			default:
+				return nil, xArgsUsage
+			}
+
+			continue
+		}
+
+		break
+	}
+
+	return args[startAt:], nil
+}

pkg/devspace/pipeline/engine/pipelinehandler/handler.go

@@ -18,6 +18,10 @@ import (
 
 // PipelineCommands are commands that can only be run within a pipeline and have special functionality in there
 var PipelineCommands = map[string]func(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string) error{
+	"xargs": func(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string) error {
+		hc := interp.HandlerCtx(devCtx.Context)
+		return commands.XArgs(devCtx, args, NewPipelineExecHandler(devCtx, hc.Stdout, pipeline))
+	},
 	"exec_container": func(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string) error {
 		return commands.ExecContainer(devCtx, args)
 	},
@@ -31,7 +35,8 @@ var PipelineCommands = map[string]func(devCtx *devspacecontext.Context, pipeline
 		return commands.RunDefaultPipeline(devCtx, pipeline, args, NewPipelineExecHandler)
 	},
 	"watch": func(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string) error {
-		return commands.Watch(devCtx, pipeline, args, NewPipelineExecHandler)
+		hc := interp.HandlerCtx(devCtx.Context)
+		return commands.Watch(devCtx, args, NewPipelineExecHandler(devCtx, hc.Stdout, pipeline))
 	},
 	"run_pipelines": func(devCtx *devspacecontext.Context, pipeline types.Pipeline, args []string) error {
 		return commands.RunPipelines(devCtx, pipeline, args)