From fdf5e958edf5c2c0763b32bc66e725bd034a3a85 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sat, 9 Mar 2019 14:23:36 -0500 Subject: Fix .env file parsing so merging works properly Signed-off-by: Dave Henderson --- data/data.go | 10 +++++++++- data/data_test.go | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/data.go b/data/data.go index 61d7808a..63596936 100644 --- a/data/data.go +++ b/data/data.go @@ -104,7 +104,15 @@ func TOML(in string) (interface{}, error) { // dotEnv - Unmarshal a dotenv file func dotEnv(in string) (interface{}, error) { - return godotenv.Unmarshal(in) + env, err := godotenv.Unmarshal(in) + if err != nil { + return nil, err + } + out := make(map[string]interface{}) + for k, v := range env { + out[k] = v + } + return out, nil } func parseCSV(args ...string) ([][]string, []string, error) { diff --git a/data/data_test.go b/data/data_test.go index c640d78e..20e6d574 100644 --- a/data/data_test.go +++ b/data/data_test.go @@ -471,7 +471,7 @@ FOO.BAR = "values can be double-quoted, and shell\nescapes are supported" BAZ = "variable expansion: ${FOO}" QUX='single quotes ignore $variables' ` - expected := map[string]string{ + expected := map[string]interface{}{ "FOO": "a regular unquoted value", "BAR": "another value, exports are ignored", "FOO.BAR": "values can be double-quoted, and shell\nescapes are supported", -- cgit v1.2.3