Skip to content
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

Rmove UseIsolatedEnv from system.Command #109

Closed
wants to merge 1 commit into from
Closed

Rmove UseIsolatedEnv from system.Command #109

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
7 changes: 3 additions & 4 deletions system/cmd_runner_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import (
)

type Command struct {
Name string
Args []string
Env map[string]string
UseIsolatedEnv bool
Name string
Args []string
Env map[string]string

WorkingDir string

Expand Down
11 changes: 1 addition & 10 deletions system/exec_cmd_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package system
import (
"os"
"os/exec"
"runtime"
"strings"

boshlog "github.com/cloudfoundry/bosh-utils/logger"
Expand Down Expand Up @@ -80,15 +79,7 @@ func (r execCmdRunner) buildComplexCommand(cmd Command) *exec.Cmd {

execCmd.Dir = cmd.WorkingDir

var env []string
if !cmd.UseIsolatedEnv {
env = os.Environ()
}
if cmd.UseIsolatedEnv && runtime.GOOS == "windows" {
panic("UseIsolatedEnv is not supported on Windows")
}

execCmd.Env = mergeEnv(env, cmd.Env)
execCmd.Env = mergeEnv(os.Environ(), cmd.Env)

return execCmd
}
19 changes: 0 additions & 19 deletions system/exec_cmd_runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ var _ = Describe("execCmdRunner", func() {

It("run complex command with env", func() {
cmd := GetPlatformCommand("env")
cmd.UseIsolatedEnv = false
stdout, stderr, status, err := runner.RunComplexCommand(cmd)
Expect(err).ToNot(HaveOccurred())

Expand All @@ -137,23 +136,6 @@ var _ = Describe("execCmdRunner", func() {
Expect(status).To(Equal(0))
})

It("runs complex command with specific env", func() {
cmd := GetPlatformCommand("env")
cmd.UseIsolatedEnv = true
if runtime.GOOS == "windows" {
Expect(func() { runner.RunComplexCommand(cmd) }).To(Panic()) //nolint:errcheck
} else {
stdout, stderr, status, err := runner.RunComplexCommand(cmd)
Expect(err).ToNot(HaveOccurred())

envVars := parseEnvFields(stdout, true)
Expect(envVars).To(HaveKeyWithValue("FOO", "BAR"))
Expect(envVars).ToNot(HaveKey("PATH"))
Expect(stderr).To(BeEmpty())
Expect(status).To(Equal(0))
}
})

setupWindowsEnvTest := func(cmdVars map[string]string) (map[string]string, error) {
os.Setenv("_FOO", "BAR") //nolint:errcheck
defer os.Unsetenv("_FOO")
Expand Down Expand Up @@ -319,7 +301,6 @@ var _ = Describe("execCmdRunner", func() {

It("allows setting custom env variable in addition to inheriting process env variables", func() {
cmd := GetPlatformCommand("env")
cmd.UseIsolatedEnv = false

process, err := runner.RunComplexCommandAsync(cmd)
Expect(err).ToNot(HaveOccurred())
Expand Down
Loading