Refactor InitEnvironmentVariables to always use os.Getwd() for working directory and add test for stale PWD override

Author: dbpolito

core/environment/env.go

@@ -29,13 +29,14 @@ func InitEnvironmentVariables(envStorage EnvStorage) {
 
 	initUid(envStorage)
 
-	if envStorage.Get("PWD") == "" {
-		workDir, err = os.Getwd()
-		if err != nil {
-			log.Fatal("Could not evaluate working directory - ", err)
-		}
-		envStorage.Set("PWD", workDir)
+	// Always use os.Getwd() to determine the working directory rather than
+	// trusting the PWD environment variable. PWD may be stale if a parent
+	// process spawned kool with a different cwd without updating PWD.
+	workDir, err = os.Getwd()
+	if err != nil {
+		log.Fatal("Could not evaluate working directory - ", err)
 	}
+	envStorage.Set("PWD", workDir)
 
 	for _, envFile := range envFiles {
 		if _, err = os.Stat(envFile); os.IsNotExist(err) {

core/environment/env_test.go

@@ -61,3 +61,23 @@ func TestInitEnvironmentVariables(t *testing.T) {
 		t.Errorf("expecting $KOOL_GLOBAL_NETWORK value 'kool_global', got '%s'", envKoolNet)
 	}
 }
+
+func TestInitEnvironmentVariablesOverridesStalePWD(t *testing.T) {
+	f := NewFakeEnvStorage()
+
+	// Simulate a stale PWD value (as might happen when spawned with cwd option)
+	f.Envs["PWD"] = "/some/stale/path"
+
+	originalEnvFiles := envFiles
+	defer func() { envFiles = originalEnvFiles }()
+	envFiles = []string{} // no env files needed for this test
+
+	InitEnvironmentVariables(f)
+
+	workDir, _ := os.Getwd()
+
+	// PWD should be overridden with the actual working directory
+	if envWorkDir := f.Envs["PWD"]; envWorkDir != workDir {
+		t.Errorf("expecting $PWD to be overridden to '%s', got '%s'", workDir, envWorkDir)
+	}
+}