Merge pull request #30 from upsight/bugfix/envparent

Changes the behavior of env parent to child
upsight · Nov 13, 2017 · 861c1cd · 861c1cd
2 parents 2c10044 + afa868b
commit 861c1cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/target/env.go b/target/env.go
@@ -148,9 +148,12 @@ func (e *Env) process() error {
 		e.config[k] = os.Expand(e.config[k], e.Getenv)
 	}
 	if e.parent != nil {
-		// set the parent envs here as final values.
+		// set the final envs from parent here as final
+		// only if the value is empty.
 		for k, v := range e.parent.Env.config {
-			e.config[k] = v
+			if e.config[k] == "" {
+				e.config[k] = v
+			}
 		}
 	}
 	return nil

diff --git a/target/env_test.go b/target/env_test.go
@@ -84,7 +84,7 @@ func TestEnv_processParentFile(t *testing.T) {
 	eParent, err := NewEnv(nil, &RawConfig{Envs: ""}, ParseOSEnvs([]string{"APP=don", "HELLO=goodbye", "ABC=+pwd"}), writer)
 	ok(t, err)
 	f := &File{Env: eParent}
-	e, err := NewEnv(f, &RawConfig{Envs: ""}, ParseOSEnvs([]string{"APP=ron", "HELLO=hello", "ABC=+pwd"}), writer)
+	e, err := NewEnv(f, &RawConfig{Envs: ""}, ParseOSEnvs([]string{"APP=", "HELLO=hello", "ABC=+pwd"}), writer)
 	ok(t, err)
 	err = e.process()
 	ok(t, err)
@@ -95,7 +95,7 @@ func TestEnv_processParentFile(t *testing.T) {
 	want := `don`
 	equals(t, want, got)
 	got = c["HELLO"]
-	want = `goodbye`
+	want = `hello`
 	equals(t, want, got)
 }