diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2021-01-17 21:44:24 -0500 |
|---|---|---|
| committer | Dave Henderson <dhenderson@gmail.com> | 2021-01-17 21:44:24 -0500 |
| commit | 8ebbbc4e09bd661491a53a8cccdb7780705f13ba (patch) | |
| tree | 023ac1b7d8e1b9e1d738a163197dc885fca83933 | |
| parent | e50653c3b565d246e88800f665f675ec3a378771 (diff) | |
Fix precedence bug with L/R Delimiters
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
| -rw-r--r-- | internal/cmd/config.go | 8 | ||||
| -rw-r--r-- | internal/cmd/config_test.go | 4 | ||||
| -rw-r--r-- | internal/tests/integration/config_test.go | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/internal/cmd/config.go b/internal/cmd/config.go index f45f5ff1..201b867a 100644 --- a/internal/cmd/config.go +++ b/internal/cmd/config.go @@ -260,8 +260,12 @@ func applyEnvVars(ctx context.Context, cfg *config.Config) (*config.Config, erro cfg.Experimental = true } - cfg.LDelim = env.Getenv("GOMPLATE_LEFT_DELIM", cfg.LDelim) - cfg.RDelim = env.Getenv("GOMPLATE_RIGHT_DELIM", cfg.RDelim) + if cfg.LDelim == "" { + cfg.LDelim = env.Getenv("GOMPLATE_LEFT_DELIM") + } + if cfg.RDelim == "" { + cfg.RDelim = env.Getenv("GOMPLATE_RIGHT_DELIM") + } return cfg, nil } diff --git a/internal/cmd/config_test.go b/internal/cmd/config_test.go index 1bc82e09..9885ef87 100644 --- a/internal/cmd/config_test.go +++ b/internal/cmd/config_test.go @@ -274,7 +274,7 @@ func TestApplyEnvVars(t *testing.T) { "GOMPLATE_LEFT_DELIM", "--", false, &config.Config{LDelim: "{{"}, - &config.Config{LDelim: "--"}, + &config.Config{LDelim: "{{"}, }, { "GOMPLATE_RIGHT_DELIM", ")>", @@ -286,7 +286,7 @@ func TestApplyEnvVars(t *testing.T) { "GOMPLATE_RIGHT_DELIM", ")>", false, &config.Config{RDelim: "}}"}, - &config.Config{RDelim: ")>"}, + &config.Config{RDelim: "}}"}, }, { "GOMPLATE_RIGHT_DELIM", "", diff --git a/internal/tests/integration/config_test.go b/internal/tests/integration/config_test.go index c4c1b77c..fb1f8e57 100644 --- a/internal/tests/integration/config_test.go +++ b/internal/tests/integration/config_test.go @@ -165,7 +165,7 @@ datasources: s.writeFile("in.yaml", `value: hello world`) result := icmd.RunCmd(icmd.Command(GomplateBin), func(cmd *icmd.Cmd) { cmd.Dir = s.tmpDir.Path() - cmd.Env = []string{"GOMPLATE_LEFT_DELIM", "<<"} + cmd.Env = []string{"GOMPLATE_LEFT_DELIM=<<"} }) result.Assert(c, icmd.Expected{ExitCode: 0, Out: "hello world"}) } @@ -183,7 +183,7 @@ datasources: s.writeFile("in.yaml", `value: hello world`) result := icmd.RunCmd(icmd.Command(GomplateBin, "--left-delim={{"), func(cmd *icmd.Cmd) { cmd.Dir = s.tmpDir.Path() - cmd.Env = []string{"GOMPLATE_LEFT_DELIM", "<<"} + cmd.Env = []string{"GOMPLATE_LEFT_DELIM=<<"} }) result.Assert(c, icmd.Expected{ExitCode: 0, Out: "hello world"}) } |