Merge pull request #2184 from FabianKramm/print-feat

refactor: allow env variables to pass through

Author: FabianKramm

cmd/init.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"mvdan.cc/sh/v3/expand"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -858,7 +859,7 @@ func appendToIgnoreFile(ignoreFile, content string) error {
 func getProjectName() (string, string, error) {
 	projectName := ""
 	projectNamespace := ""
-	gitRemote, err := command.Output(context.TODO(), "", "git", "config", "--get", "remote.origin.url")
+	gitRemote, err := command.Output(context.TODO(), "", expand.ListEnviron(os.Environ()...), "git", "config", "--get", "remote.origin.url")
 	if err == nil {
 		sep := "/"
 		projectParts := strings.Split(string(regexp.MustCompile(`^.*?://[^/]+?/([^.]+)(\.git)?`).ReplaceAll(gitRemote, []byte("$1"))), sep)

cmd/run.go

@@ -3,7 +3,9 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/env"
 	"io"
+	"mvdan.cc/sh/v3/expand"
 	"os"
 	"strings"
 
@@ -257,7 +259,7 @@ func executeShellCommand(ctx context.Context, shellCommand string, variables map
 	}
 
 	// execute the command in a shell
-	err := engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, stdin, extraEnv, shellCommand, args...)
+	err := engine.ExecuteSimpleShellCommand(ctx, dir, env.NewVariableEnvProvider(expand.ListEnviron(os.Environ()...), extraEnv), stdout, stderr, stdin, shellCommand, args...)
 	if err != nil {
 		if status, ok := interp.IsExitStatus(err); ok {
 			return &exit.ReturnCodeError{
@@ -292,7 +294,7 @@ func ExecuteCommand(ctx context.Context, cmd *latest.CommandConfig, variables ma
 		}
 
 		// execute the command in a shell
-		err := engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, stdin, extraEnv, shellCommand, args...)
+		err := engine.ExecuteSimpleShellCommand(ctx, dir, env.NewVariableEnvProvider(expand.ListEnviron(os.Environ()...), extraEnv), stdout, stderr, stdin, shellCommand, args...)
 		if err != nil {
 			if status, ok := interp.IsExitStatus(err); ok {
 				return &exit.ReturnCodeError{
@@ -307,7 +309,7 @@ func ExecuteCommand(ctx context.Context, cmd *latest.CommandConfig, variables ma
 	}
 
 	shellArgs = append(shellArgs, args...)
-	return command.CommandWithEnv(ctx, dir, stdout, stderr, stdin, extraEnv, shellCommand, shellArgs...)
+	return command.Command(ctx, dir, env.NewVariableEnvProvider(expand.ListEnviron(os.Environ()...), extraEnv), stdout, stderr, stdin, shellCommand, shellArgs...)
 }
 
 // RunCommandCmd holds the cmd flags of a run command

docs/pages/configuration/_partials/v2beta1/commands.mdx

@@ -7,8 +7,7 @@ import PartialCommandsreference from "./commands_reference.mdx"
 
 ## `commands` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">&lt;command_name&gt;:object</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands}
 
-Commands are custom commands that can be executed via 'devspace run COMMAND'. These commands are run within a pseudo bash
-that also allows executing special commands such as run_watch or is_equal.
+Commands are custom commands that can be executed via 'devspace run COMMAND'. These commands are run within a pseudo bash that also allows executing special commands such as run_watch or is_equal.
 
 </summary>
 
@@ -18,7 +17,7 @@ that also allows executing special commands such as run_watch or is_equal.
 
 ## `<command_name>` <span className="config-field-required" data-required="true">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-name}
 
-Name is the name of a command that is used via `devspace run NAME`
+Name is the name of a command that is used via 'devspace run NAME'.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/after.mdx

@@ -4,10 +4,7 @@
 
 ### `after` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-after}
 
-After is executed after the command was run. It is executed also when
-the command was interrupted which will set the env variable COMMAND_INTERRUPT
-to true as well as when the command errored which will set the error string to
-COMMAND_ERROR.
+After is executed after the command was run. It is executed also when the command was interrupted which will set the env variable COMMAND_INTERRUPT to true as well as when the command errored which will set the error string to COMMAND_ERROR.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/appendArgs.mdx

@@ -4,8 +4,7 @@
 
 ### `appendArgs` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">false</span> <span className="config-field-enum"></span> {#commands-appendArgs}
 
-AppendArgs will append arguments passed to the DevSpace command automatically to
-the specified command.
+AppendArgs will append arguments passed to the DevSpace command automatically to the specified command.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/args.mdx

@@ -4,8 +4,7 @@
 
 ### `args` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string[]</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-args}
 
-Args are optional and if defined, command is not executed within a shell
-and rather directly.
+Args are optional and if defined, command is not executed within a shell and rather directly.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/command.mdx

@@ -4,7 +4,7 @@
 
 ### `command` <span className="config-field-required" data-required="true">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-command}
 
-Command is the command that should be executed. For example: 'echo 123'
+Command is the command that should be executed. For example: 'echo 123'.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/description.mdx

@@ -4,7 +4,7 @@
 
 ### `description` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-description}
 
-Description describes what the command is doing and can be seen in `devspace list commands`
+Description describes what the command is doing and can be seen in 'devspace list commands'.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/internal.mdx

@@ -4,7 +4,7 @@
 
 ### `internal` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">false</span> <span className="config-field-enum"></span> {#commands-internal}
 
-Internal commands are not show in list and are usable through run_command
+Internal commands are not show in list and are usable through run_command.
 
 </summary>
 

docs/pages/configuration/_partials/v2beta1/commands/section.mdx

@@ -4,7 +4,7 @@
 
 ### `section` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#commands-section}
 
-Section can be used to group similar commands together in `devspace list commands`
+Section can be used to group similar commands together in 'devspace list commands'.
 
 </summary>