refactor: use single shell implementation

Author: FabianKramm

pkg/devspace/build/builder/custom/custom.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/util/shell"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"github.com/sirupsen/logrus"
 	"io"
 	"strings"
@@ -163,7 +163,7 @@ func (b *Builder) Build(ctx *devspacecontext.Context) error {
 
 	ctx.Log.Infof("Build %s:%s with custom command '%s %s'", b.imageConf.Image, b.imageTags[0], commandPath, strings.Join(args, " "))
 	if len(args) == 0 {
-		err = shell.ExecuteShellCommand(ctx.Context, ctx.WorkingDir, writer, writer, nil, nil, commandPath, args...)
+		err = engine.ExecuteSimpleShellCommand(ctx.Context, ctx.WorkingDir, writer, writer, nil, nil, commandPath, args...)
 		if err != nil {
 			return errors.Errorf("error building image: %v", err)
 		}

pkg/devspace/command/command.go

@@ -2,11 +2,11 @@ package command
 
 import (
 	"context"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"io"
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/util/command"
-	"github.com/loft-sh/devspace/pkg/util/shell"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 
@@ -42,7 +42,7 @@ func ExecuteCommand(ctx context.Context, commands map[string]*latest.CommandConf
 		}
 
 		// execute the command in a shell
-		return shell.ExecuteShellCommand(ctx, dir, stdout, stderr, stdin, nil, shellCommand, args...)
+		return engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, stdin, nil, shellCommand, args...)
 	}
 
 	shellArgs = append(shellArgs, args...)

pkg/devspace/config/loader/variable/command_variable.go

@@ -3,11 +3,11 @@ package variable
 import (
 	"bytes"
 	"context"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/command"
-	"github.com/loft-sh/devspace/pkg/util/shell"
 	"github.com/pkg/errors"
 )
 
@@ -52,7 +52,7 @@ func execCommand(ctx context.Context, varName string, definition *latest.Variabl
 	stdErrWriter := &bytes.Buffer{}
 	var err error
 	if args == nil {
-		err = shell.ExecuteShellCommand(ctx, dir, writer, stdErrWriter, nil, nil, cmd)
+		err = engine.ExecuteSimpleShellCommand(ctx, dir, writer, stdErrWriter, nil, nil, cmd)
 	} else {
 		err = command.Command(ctx, dir, writer, stdErrWriter, nil, cmd, args...)
 	}

pkg/devspace/config/loader/variable/expression/expression.go

@@ -4,13 +4,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"os"
 	"regexp"
 	"strconv"
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/devspace/deploy/deployer/kubectl/walk"
-	"github.com/loft-sh/devspace/pkg/util/shell"
 	"gopkg.in/yaml.v3"
 )
 
@@ -77,7 +77,7 @@ func ResolveExpressions(ctx context.Context, value, dir string) (interface{}, er
 
 		stdout := &bytes.Buffer{}
 		stderr := &bytes.Buffer{}
-		err := shell.ExecuteShellCommand(ctx, dir, stdout, stderr, nil, nil, match[1], os.Args[1:]...)
+		err := engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, nil, nil, match[1], os.Args[1:]...)
 		if err != nil {
 			return nil, fmt.Errorf("error executing config expression %s: %v (stdout: %s, stderr: %s)", match[1], err, stdout.String(), stderr.String())
 		}

pkg/devspace/configure/deployment.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"github.com/sirupsen/logrus"
 	"net/http"
 	"os"
@@ -13,7 +14,6 @@ import (
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/ptr"
-	"github.com/loft-sh/devspace/pkg/util/shell"
 	"github.com/loft-sh/devspace/pkg/util/survey"
 	"github.com/loft-sh/devspace/pkg/util/yamlutil"
 )
@@ -262,7 +262,7 @@ func (m *manager) AddHelmDeployment(deploymentName string) error {
 				m.log.WriteString(logrus.InfoLevel, "\n")
 				m.log.Infof("Cloning external repo `%s` containing to retrieve Helm chart", gitRepo)
 
-				err = shell.ExecuteShellCommand(context.TODO(), "", os.Stdout, os.Stderr, nil, nil, gitCommand)
+				err = engine.ExecuteSimpleShellCommand(context.TODO(), "", os.Stdout, os.Stderr, nil, nil, gitCommand)
 				if err != nil {
 					m.log.WriteString(logrus.InfoLevel, "\n")
 					m.log.Errorf("Unable to clone repository `%s` (branch: %s)", gitRepo, gitBranch)

pkg/devspace/hook/local_command.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"io"
 	"os"
 	"strings"
@@ -14,7 +15,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
 	"github.com/loft-sh/devspace/pkg/util/command"
-	"github.com/loft-sh/devspace/pkg/util/shell"
 	"github.com/pkg/errors"
 )
 
@@ -64,7 +64,7 @@ func (l *localCommandHook) Execute(ctx *devspacecontext.Context, hook *latest.Ho
 	}()
 
 	if hook.Args == nil {
-		return shell.ExecuteShellCommand(ctx.Context, ctx.WorkingDir, io.MultiWriter(l.Stdout, stdout), io.MultiWriter(l.Stderr, stderr), nil, extraEnv, hookCommand)
+		return engine.ExecuteSimpleShellCommand(ctx.Context, ctx.WorkingDir, io.MultiWriter(l.Stdout, stdout), io.MultiWriter(l.Stderr, stderr), nil, extraEnv, hookCommand)
 	}
 
 	// else we execute it directly