🔧🧹 Fix tests and clean-up;

Author: joergdw

cloud/cpi_cmd_runner.go

@@ -66,7 +66,7 @@ type CPICmdRunner interface {
 }
 
 type cpiCmdRunner struct {
-	cmdRunner boshsys.CmdRunner
+	cmdRunner      boshsys.CmdRunner
 	cpi            CPI
 	logger         boshlog.Logger
 	logTag         string
@@ -80,10 +80,10 @@ func NewCPICmdRunner(
 	useIsolatedEnv bool,
 ) CPICmdRunner {
 	return &cpiCmdRunner{
-		cmdRunner: cmdRunner,
-		cpi:       cpi,
-		logger:    logger,
-		logTag:    "cpiCmdRunner",
+		cmdRunner:      cmdRunner,
+		cpi:            cpi,
+		logger:         logger,
+		logTag:         "cpiCmdRunner",
 		useIsolatedEnv: useIsolatedEnv,
 	}
 }
@@ -114,7 +114,6 @@ func (r *cpiCmdRunner) Run(context CmdContext, method string, apiVersion int, ar
 		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)

cloud/cpi_cmd_runner_test.go

@@ -35,7 +35,7 @@ var _ = Describe("CpiCmdRunner", func() {
 
 		cmdRunner = fakesys.NewFakeCmdRunner()
 		logger := boshlog.NewLogger(boshlog.LevelNone)
-		cpiCmdRunner = NewCPICmdRunner(cmdRunner, cpi, logger)
+		cpiCmdRunner = NewCPICmdRunner(cmdRunner, cpi, logger, true)
 
 		apiVersion = 1
 	})

flake.nix

@@ -25,6 +25,7 @@
               delve
               go
               gopls
+              gotools
             ];
           };
         });

installation/pkg/compiler.go

@@ -1,7 +1,6 @@
 package pkg
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 
@@ -111,8 +110,6 @@ 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")