From 8ebbbc4e09bd661491a53a8cccdb7780705f13ba Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sun, 17 Jan 2021 21:44:24 -0500 Subject: Fix precedence bug with L/R Delimiters Signed-off-by: Dave Henderson --- internal/cmd/config.go | 8 ++++++-- internal/cmd/config_test.go | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'internal/cmd') 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", "", -- cgit v1.2.3