Skip to content

Commit 75d86bc

Browse files
fmoehlerfmoehler
committed
remove isolated env
1 parent bdf1b53 commit 75d86bc

File tree

8 files changed

+26
-117
lines changed

8 files changed

+26
-117
lines changed

‎cloud/cpi_cmd_runner.go‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"encoding/json"
66
"fmt"
7-
"os"
87

98
bosherr "github.com/cloudfoundry/bosh-utils/errors"
109
boshlog "github.com/cloudfoundry/bosh-utils/logger"
@@ -66,25 +65,22 @@ type CPICmdRunner interface {
6665
}
6766

6867
type cpiCmdRunner struct {
69-
cmdRunner boshsys.CmdRunner
70-
cpi CPI
71-
logger boshlog.Logger
72-
logTag string
73-
useIsolatedEnv bool
68+
cmdRunner boshsys.CmdRunner
69+
cpi CPI
70+
logger boshlog.Logger
71+
logTag string
7472
}
7573

7674
func NewCPICmdRunner(
7775
cmdRunner boshsys.CmdRunner,
7876
cpi CPI,
7977
logger boshlog.Logger,
80-
useIsolatedEnv bool,
8178
) CPICmdRunner {
8279
return &cpiCmdRunner{
83-
cmdRunner: cmdRunner,
84-
cpi: cpi,
85-
logger: logger,
86-
logTag: "cpiCmdRunner",
87-
useIsolatedEnv: useIsolatedEnv,
80+
cmdRunner: cmdRunner,
81+
cpi: cpi,
82+
logger: logger,
83+
logTag: "cpiCmdRunner",
8884
}
8985
}
9086

@@ -109,10 +105,8 @@ func (r *cpiCmdRunner) Run(context CmdContext, method string, apiVersion int, ar
109105
Env: map[string]string{
110106
"BOSH_PACKAGES_DIR": r.cpi.PackagesDir,
111107
"BOSH_JOBS_DIR": r.cpi.JobsDir,
112-
"PATH": os.Getenv("PATH"),
113108
},
114-
UseIsolatedEnv: r.useIsolatedEnv,
115-
Stdin: bytes.NewReader(inputBytes),
109+
Stdin: bytes.NewReader(inputBytes),
116110
}
117111

118112
stdout, stderr, exitCode, err := r.cmdRunner.RunComplexCommand(cmd)

‎cloud/cpi_cmd_runner_test.go‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"errors"
66
"io"
7-
"os"
87

98
boshlog "github.com/cloudfoundry/bosh-utils/logger"
109
fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
@@ -21,7 +20,6 @@ var _ = Describe("CpiCmdRunner", func() {
2120
cmdRunner *fakesys.FakeCmdRunner
2221
cpi CPI
2322
apiVersion int
24-
logger boshlog.Logger
2523
)
2624

2725
BeforeEach(func() {
@@ -36,8 +34,8 @@ var _ = Describe("CpiCmdRunner", func() {
3634
}
3735

3836
cmdRunner = fakesys.NewFakeCmdRunner()
39-
logger = boshlog.NewLogger(boshlog.LevelNone)
40-
cpiCmdRunner = NewCPICmdRunner(cmdRunner, cpi, logger, true)
37+
logger := boshlog.NewLogger(boshlog.LevelNone)
38+
cpiCmdRunner = NewCPICmdRunner(cmdRunner, cpi, logger)
4139

4240
apiVersion = 1
4341
})
@@ -64,7 +62,6 @@ var _ = Describe("CpiCmdRunner", func() {
6462
Expect(actualCmd.Env).To(Equal(map[string]string{
6563
"BOSH_PACKAGES_DIR": cpi.PackagesDir,
6664
"BOSH_JOBS_DIR": cpi.JobsDir,
67-
"PATH": os.Getenv("PATH"),
6865
}))
6966
Expect(actualCmd.UseIsolatedEnv).To(BeTrue())
7067
bytes, err := io.ReadAll(actualCmd.Stdin)
@@ -90,23 +87,6 @@ var _ = Describe("CpiCmdRunner", func() {
9087
apiVersion = 2
9188
})
9289

93-
It("creates correct command with UseIsolatedEnv false if NewCPICmdRunner is initialized with false", func() {
94-
cpiCmdRunner = NewCPICmdRunner(cmdRunner, cpi, logger, false)
95-
cmdOutput := CmdOutput{}
96-
outputBytes, err := json.Marshal(cmdOutput)
97-
Expect(err).NotTo(HaveOccurred())
98-
99-
result := fakesys.FakeCmdResult{
100-
Stdout: string(outputBytes),
101-
ExitStatus: 0,
102-
}
103-
cmdRunner.AddCmdResult("/jobs/cpi/bin/cpi", result)
104-
_, err = cpiCmdRunner.Run(context, "fake-method", apiVersion, "fake-argument-1", "fake-argument-2")
105-
Expect(err).NotTo(HaveOccurred())
106-
actualCmd := cmdRunner.RunComplexCommands[0]
107-
Expect(actualCmd.UseIsolatedEnv).To(BeFalse())
108-
109-
})
11090
It("creates correct command with stemcell api_version in context", func() {
11191
cmdOutput := CmdOutput{}
11292
outputBytes, err := json.Marshal(cmdOutput)
@@ -128,7 +108,6 @@ var _ = Describe("CpiCmdRunner", func() {
128108
Expect(actualCmd.Env).To(Equal(map[string]string{
129109
"BOSH_PACKAGES_DIR": cpi.PackagesDir,
130110
"BOSH_JOBS_DIR": cpi.JobsDir,
131-
"PATH": os.Getenv("PATH"),
132111
}))
133112
Expect(actualCmd.UseIsolatedEnv).To(BeTrue())
134113
bytes, err := io.ReadAll(actualCmd.Stdin)

‎cloud/factory.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,20 @@ type Factory interface {
1313
}
1414

1515
type factory struct {
16-
fs boshsys.FileSystem
17-
cmdRunner boshsys.CmdRunner
18-
logger boshlog.Logger
19-
useIsolatedEnv bool
16+
fs boshsys.FileSystem
17+
cmdRunner boshsys.CmdRunner
18+
logger boshlog.Logger
2019
}
2120

2221
func NewFactory(
2322
fs boshsys.FileSystem,
2423
cmdRunner boshsys.CmdRunner,
2524
logger boshlog.Logger,
26-
useIsolatedEnv bool,
2725
) Factory {
2826
return &factory{
29-
fs: fs,
30-
cmdRunner: cmdRunner,
31-
logger: logger,
32-
useIsolatedEnv: useIsolatedEnv,
27+
fs: fs,
28+
cmdRunner: cmdRunner,
29+
logger: logger,
3330
}
3431
}
3532

@@ -56,6 +53,6 @@ func (f *factory) NewCloud(installation biinstall.Installation, directorID strin
5653
return nil, bosherr.Errorf("Found %d Jobs with a 'bin/cpi' binary. Expected 1.", numberCpiBinariesFound)
5754
}
5855

59-
cpiCmdRunner := NewCPICmdRunner(f.cmdRunner, foundCPI, f.logger, f.useIsolatedEnv)
56+
cpiCmdRunner := NewCPICmdRunner(f.cmdRunner, foundCPI, f.logger)
6057
return NewCloud(cpiCmdRunner, directorID, stemcellApiVersion, f.logger), nil
6158
}

‎cmd/cmd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,31 @@ func (c Cmd) Execute() (cmdErr error) {
7272

7373
case *CreateEnvOpts:
7474
envProvider := func(manifestPath string, statePath string, vars boshtpl.Variables, op patch.Op) DeploymentPreparer {
75-
return NewEnvFactory(deps, manifestPath, statePath, vars, op, opts.RecreatePersistentDisks, opts.PackageDir, !opts.AvoidIsolatedEnv).Preparer()
75+
return NewEnvFactory(deps, manifestPath, statePath, vars, op, opts.RecreatePersistentDisks, opts.PackageDir).Preparer()
7676
}
7777

7878
stage := boshui.NewStage(deps.UI, deps.Time, deps.Logger)
7979
return NewCreateEnvCmd(deps.UI, envProvider).Run(stage, *opts)
8080

8181
case *DeleteEnvOpts:
8282
envProvider := func(manifestPath string, statePath string, vars boshtpl.Variables, op patch.Op) DeploymentDeleter {
83-
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, opts.PackageDir, true).Deleter()
83+
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, opts.PackageDir).Deleter()
8484
}
8585

8686
stage := boshui.NewStage(deps.UI, deps.Time, deps.Logger)
8787
return NewDeleteEnvCmd(deps.UI, envProvider).Run(stage, *opts)
8888

8989
case *StopEnvOpts:
9090
envProvider := func(manifestPath string, statePath string, vars boshtpl.Variables, op patch.Op) DeploymentStateManager {
91-
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, "", true).StateManager()
91+
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, "").StateManager()
9292
}
9393

9494
stage := boshui.NewStage(deps.UI, deps.Time, deps.Logger)
9595
return NewStopEnvCmd(deps.UI, envProvider).Run(stage, *opts)
9696

9797
case *StartEnvOpts:
9898
envProvider := func(manifestPath string, statePath string, vars boshtpl.Variables, op patch.Op) DeploymentStateManager {
99-
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, "", true).StateManager()
99+
return NewEnvFactory(deps, manifestPath, statePath, vars, op, false, "").StateManager()
100100
}
101101

102102
stage := boshui.NewStage(deps.UI, deps.Time, deps.Logger)

‎cmd/env_factory.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ func NewEnvFactory(
7272
manifestOp patch.Op,
7373
recreatePersistentDisks bool,
7474
packageDir string,
75-
useIsolatedEnv bool,
7675
) *envFactory {
7776
f := envFactory{
7877
deps: deps,
@@ -118,7 +117,7 @@ func NewEnvFactory(
118117
{
119118
installerFactory := boshinst.NewInstallerFactory(
120119
deps.UI, deps.CmdRunner, deps.Compressor, releaseJobResolver,
121-
deps.UUIDGen, deps.Logger, useIsolatedEnv, deps.FS, deps.DigestCreationAlgorithms)
120+
deps.UUIDGen, deps.Logger, deps.FS, deps.DigestCreationAlgorithms)
122121

123122
f.cpiInstaller = bicpirel.CpiInstaller{
124123
ReleaseManager: f.releaseManager,
@@ -150,7 +149,7 @@ func NewEnvFactory(
150149
f.blobstoreFactory = biblobstore.NewBlobstoreFactory(deps.UUIDGen, deps.FS, deps.Logger)
151150
f.deploymentFactory = bidepl.NewFactory(10*time.Second, 500*time.Millisecond)
152151
f.agentClientFactory = bihttpagent.NewAgentClientFactory(1*time.Second, deps.Logger)
153-
f.cloudFactory = bicloud.NewFactory(deps.FS, deps.CmdRunner, deps.Logger, useIsolatedEnv)
152+
f.cloudFactory = bicloud.NewFactory(deps.FS, deps.CmdRunner, deps.Logger)
154153
}
155154

156155
{

‎installation/installer_factory.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ type installerFactory struct {
3030
releaseJobResolver bideplrel.JobResolver
3131
uuidGenerator boshuuid.Generator
3232
logger boshlog.Logger
33-
useIsolatedEnv bool
3433
logTag string
3534
fs boshsys.FileSystem
3635
digestCreateAlgorithms []boshcrypto.Algorithm
@@ -43,7 +42,6 @@ func NewInstallerFactory(
4342
releaseJobResolver bideplrel.JobResolver,
4443
uuidGenerator boshuuid.Generator,
4544
logger boshlog.Logger,
46-
useIsolatedEnv bool,
4745
fs boshsys.FileSystem,
4846
digestCreateAlgorithms []boshcrypto.Algorithm,
4947
) InstallerFactory {
@@ -54,7 +52,6 @@ func NewInstallerFactory(
5452
releaseJobResolver: releaseJobResolver,
5553
uuidGenerator: uuidGenerator,
5654
logger: logger,
57-
useIsolatedEnv: useIsolatedEnv,
5855
logTag: "installer",
5956
fs: fs,
6057
digestCreateAlgorithms: digestCreateAlgorithms,
@@ -66,7 +63,6 @@ func (f *installerFactory) NewInstaller(target Target) Installer {
6663
target: target,
6764
runner: f.runner,
6865
logger: f.logger,
69-
useIsolatedEnv: f.useIsolatedEnv,
7066
extractor: f.extractor,
7167
uuidGenerator: f.uuidGenerator,
7268
releaseJobResolver: f.releaseJobResolver,
@@ -89,7 +85,6 @@ type installerFactoryContext struct {
8985
fs boshsys.FileSystem
9086
runner boshsys.CmdRunner
9187
logger boshlog.Logger
92-
useIsolatedEnv bool
9388
extractor boshcmd.Compressor
9489
uuidGenerator boshuuid.Generator
9590
releaseJobResolver bideplrel.JobResolver
@@ -153,7 +148,6 @@ func (c *installerFactoryContext) InstallationStatePackageCompiler() bistatepkg.
153148
c.CompiledPackageRepo(),
154149
c.BlobExtractor(),
155150
c.logger,
156-
c.useIsolatedEnv,
157151
)
158152

159153
return c.packageCompiler

‎installation/pkg/compiler.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ type compiler struct {
2626
blobExtractor blobextract.Extractor
2727
logger boshlog.Logger
2828
logTag string
29-
useIsolatedEnv bool
3029
}
3130

3231
func NewPackageCompiler(
@@ -38,7 +37,6 @@ func NewPackageCompiler(
3837
compiledPackageRepo bistatepkg.CompiledPackageRepo,
3938
blobExtractor blobextract.Extractor,
4039
logger boshlog.Logger,
41-
useIsolatedEnv bool,
4240
) bistatepkg.Compiler {
4341
return &compiler{
4442
runner: runner,
@@ -50,7 +48,6 @@ func NewPackageCompiler(
5048
blobExtractor: blobExtractor,
5149
logger: logger,
5250
logTag: "packageCompiler",
53-
useIsolatedEnv: useIsolatedEnv,
5451
}
5552
}
5653

@@ -105,11 +102,8 @@ func (c *compiler) Compile(pkg birelpkg.Compilable) (bistatepkg.CompiledPackageR
105102
"BOSH_INSTALL_TARGET": installDir,
106103
"BOSH_PACKAGE_NAME": pkg.Name(),
107104
"BOSH_PACKAGES_DIR": c.packagesDir,
108-
"PATH": os.Getenv("PATH"),
109-
"LD_LIBRARY_PATH": os.Getenv("LD_LIBRARY_PATH"),
110105
},
111-
UseIsolatedEnv: c.useIsolatedEnv,
112-
WorkingDir: packageSrcDir,
106+
WorkingDir: packageSrcDir,
113107
}
114108

115109
_, _, _, err = c.runner.RunComplexCommand(cmd)

‎installation/pkg/compiler_test.go‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package pkg_test
22

33
import (
44
"errors"
5-
"os"
65
"path/filepath"
76

87
fakeblobstore "github.com/cloudfoundry/bosh-utils/blobstore/fakes"
@@ -37,7 +36,6 @@ var _ = Describe("PackageCompiler", func() {
3736

3837
var (
3938
logger boshlog.Logger
40-
useIsolatedEnv bool
4139
compiler bistatepkg.Compiler
4240
runner *fakesys.FakeCmdRunner
4341
pkg *birelpkg.Package
@@ -55,8 +53,6 @@ var _ = Describe("PackageCompiler", func() {
5553

5654
BeforeEach(func() {
5755
logger = boshlog.NewLogger(boshlog.LevelNone)
58-
useIsolatedEnv = true
59-
6056
packagesDir = "fake-packages-dir"
6157
runner = fakesys.NewFakeCmdRunner()
6258
fs = fakesys.NewFakeFileSystem()
@@ -86,7 +82,6 @@ var _ = Describe("PackageCompiler", func() {
8682
mockCompiledPackageRepo,
8783
fakeExtractor,
8884
logger,
89-
useIsolatedEnv,
9085
)
9186
})
9287

@@ -179,57 +174,14 @@ var _ = Describe("PackageCompiler", func() {
179174
"BOSH_INSTALL_TARGET": installPath,
180175
"BOSH_PACKAGE_NAME": "pkg1-name",
181176
"BOSH_PACKAGES_DIR": packagesDir,
182-
"PATH": os.Getenv("PATH"),
183-
"LD_LIBRARY_PATH": os.Getenv("LD_LIBRARY_PATH"),
184177
},
185-
UseIsolatedEnv: true,
186-
WorkingDir: "/pkg-dir",
178+
WorkingDir: "/pkg-dir",
187179
}
188180

189181
Expect(runner.RunComplexCommands).To(HaveLen(1))
190182
Expect(runner.RunComplexCommands[0]).To(Equal(expectedCmd))
191183
})
192184

193-
Context("when useIsolatedEnv is set to false", func() {
194-
BeforeEach(func() {
195-
useIsolatedEnv = false
196-
compiler = NewPackageCompiler(
197-
runner,
198-
packagesDir,
199-
fs,
200-
compressor,
201-
blobstore,
202-
mockCompiledPackageRepo,
203-
fakeExtractor,
204-
logger,
205-
useIsolatedEnv,
206-
)
207-
})
208-
209-
It("runs the packaging script with UseIsolatedEnv set to false", func() {
210-
_, _, err := compiler.Compile(pkg)
211-
Expect(err).ToNot(HaveOccurred())
212-
213-
expectedCmd := boshsys.Command{
214-
Name: "bash",
215-
Args: []string{"-x", "packaging"},
216-
Env: map[string]string{
217-
"BOSH_COMPILE_TARGET": "/pkg-dir",
218-
"BOSH_INSTALL_TARGET": installPath,
219-
"BOSH_PACKAGE_NAME": "pkg1-name",
220-
"BOSH_PACKAGES_DIR": packagesDir,
221-
"PATH": os.Getenv("PATH"),
222-
"LD_LIBRARY_PATH": os.Getenv("LD_LIBRARY_PATH"),
223-
},
224-
UseIsolatedEnv: false,
225-
WorkingDir: "/pkg-dir",
226-
}
227-
228-
Expect(runner.RunComplexCommands).To(HaveLen(1))
229-
Expect(runner.RunComplexCommands[0]).To(Equal(expectedCmd))
230-
})
231-
})
232-
233185
It("compresses the compiled package", func() {
234186
_, _, err := compiler.Compile(pkg)
235187
Expect(err).ToNot(HaveOccurred())

0 commit comments

Comments
 (0)