Propagate useIsolatedEnv through to cpi_cmd_runner.go;

Author: joergdw

cloud/cpi_cmd_runner.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"strconv"
 
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
@@ -68,21 +67,24 @@ type CPICmdRunner interface {
 
 type cpiCmdRunner struct {
 	cmdRunner boshsys.CmdRunner
-	cpi       CPI
-	logger    boshlog.Logger
-	logTag    string
+	cpi            CPI
+	logger         boshlog.Logger
+	logTag         string
+	useIsolatedEnv bool
 }
 
 func NewCPICmdRunner(
 	cmdRunner boshsys.CmdRunner,
 	cpi CPI,
 	logger boshlog.Logger,
+	useIsolatedEnv bool,
 ) CPICmdRunner {
 	return &cpiCmdRunner{
 		cmdRunner: cmdRunner,
 		cpi:       cpi,
 		logger:    logger,
 		logTag:    "cpiCmdRunner",
+		useIsolatedEnv: useIsolatedEnv,
 	}
 }
 
@@ -100,14 +102,6 @@ func (r *cpiCmdRunner) Run(context CmdContext, method string, apiVersion int, ar
 	if err != nil {
 		return CmdOutput{}, bosherr.WrapErrorf(err, "Marshalling external CPI command input %#v", cmdInput)
 	}
-	useIsolatedEnv := true
-	value, present := os.LookupEnv("BOSH_CPI_USE_ISOLATED_ENV")
-	if present {
-		useIsolatedEnv, err = strconv.ParseBool(value)
-		if err != nil {
-			return CmdOutput{}, bosherr.WrapErrorf(err, "Parsing $BOSH_CPI_USE_ISOLATED_ENV error, could not parse value: %v", value)
-		}
-	}
 
 	cmdPath := r.cpi.ExecutablePath()
 	cmd := boshsys.Command{
@@ -117,11 +111,11 @@ func (r *cpiCmdRunner) Run(context CmdContext, method string, apiVersion int, ar
 			"BOSH_JOBS_DIR":     r.cpi.JobsDir,
 			"PATH":              os.Getenv("PATH"),
 		},
-		// 🚧 To-do: Make this configurable via cli-flag or use everywhere the environment-variable
-		// “BOSH_CPI_USE_ISOLATED_ENV” as in cpi_cmd_runner.go, see <https://github.com/cloudfoundry/bosh-cli/issues/660>.
-		UseIsolatedEnv: useIsolatedEnv,
+		UseIsolatedEnv: r.useIsolatedEnv,
 		Stdin:          bytes.NewReader(inputBytes),
 	}
+	fmt.Printf("cpi_cmd_runner.go: UseIsolatedEnv = %t\n", cmd.UseIsolatedEnv) // 🚧 To-do: Debug-code
+
 	stdout, stderr, exitCode, err := r.cmdRunner.RunComplexCommand(cmd)
 	r.logger.Debug(r.logTag, "Exit Code %d when executing external CPI command '%s'\nSTDIN: '%s'\nSTDOUT: '%s'\nSTDERR: '%s'", exitCode, cmdPath, string(inputBytes), stdout, stderr)
 	if err != nil {

cloud/factory.go

@@ -12,20 +12,23 @@ type Factory interface {
 }
 
 type factory struct {
-	fs        boshsys.FileSystem
-	cmdRunner boshsys.CmdRunner
-	logger    boshlog.Logger
+	fs             boshsys.FileSystem
+	cmdRunner      boshsys.CmdRunner
+	logger         boshlog.Logger
+	useIsolatedEnv bool
 }
 
 func NewFactory(
 	fs boshsys.FileSystem,
 	cmdRunner boshsys.CmdRunner,
 	logger boshlog.Logger,
+	useIsolatedEnv bool,
 ) Factory {
 	return &factory{
-		fs:        fs,
-		cmdRunner: cmdRunner,
-		logger:    logger,
+		fs:             fs,
+		cmdRunner:      cmdRunner,
+		logger:         logger,
+		useIsolatedEnv: useIsolatedEnv,
 	}
 }
 
@@ -43,6 +46,6 @@ func (f *factory) NewCloud(installation biinstall.Installation, directorID strin
 		return nil, bosherr.Errorf("Installed CPI job '%s' does not contain the required executable '%s'", cpiJob.Name, cmdPath)
 	}
 
-	cpiCmdRunner := NewCPICmdRunner(f.cmdRunner, cpi, f.logger)
+	cpiCmdRunner := NewCPICmdRunner(f.cmdRunner, cpi, f.logger, f.useIsolatedEnv)
 	return NewCloud(cpiCmdRunner, directorID, stemcellApiVersion, f.logger), nil
 }

cmd/env_factory.go

@@ -150,7 +150,7 @@ func NewEnvFactory(
 		f.blobstoreFactory = biblobstore.NewBlobstoreFactory(deps.UUIDGen, deps.FS, deps.Logger)
 		f.deploymentFactory = bidepl.NewFactory(10*time.Second, 500*time.Millisecond)
 		f.agentClientFactory = bihttpagent.NewAgentClientFactory(1*time.Second, deps.Logger)
-		f.cloudFactory = bicloud.NewFactory(deps.FS, deps.CmdRunner, deps.Logger)
+		f.cloudFactory = bicloud.NewFactory(deps.FS, deps.CmdRunner, deps.Logger, useIsolatedEnv)
 	}
 
 	{

cmd/opts/opts.go

@@ -197,7 +197,7 @@ type CreateEnvOpts struct {
 	StatePath               string `long:"state" value-name:"PATH" description:"State file path"`
 	Recreate                bool   `long:"recreate" description:"Recreate VM in deployment"`
 	RecreatePersistentDisks bool   `long:"recreate-persistent-disks" description:"Recreate persistent disks in the deployment"`
-	AvoidIsolatedEnv          bool   `long:"avoid-isolated-environment" short:"I" description:"Compile and run cpi-commands in a clean environment or not"`
+	AvoidIsolatedEnv        bool   `long:"avoid-isolated-environment" short:"I" description:"Compile and run cpi-commands in a clean environment or not"`
 	cmd
 }
 

installation/pkg/compiler.go

@@ -1,6 +1,7 @@
 package pkg
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 
@@ -110,6 +111,8 @@ func (c *compiler) Compile(pkg birelpkg.Compilable) (bistatepkg.CompiledPackageR
 		WorkingDir:     packageSrcDir,
 	}
 
+	fmt.Printf("compiler.go: UseIsolatedEnv = %t\n", cmd.UseIsolatedEnv) // 🚧 To-do: Debug-code
+
 	_, _, _, err = c.runner.RunComplexCommand(cmd)
 	if err != nil {
 		return record, isCompiledPackage, bosherr.WrapError(err, "Compiling package")