From 871abf1053e99274e7336db3143ca5eb17013e38 Mon Sep 17 00:00:00 2001 From: Mark Sargent <99003+sarge@users.noreply.github.com> Date: Fri, 10 Jan 2020 15:34:22 +1300 Subject: caddyfile: fix replacing variables on imported files (#2970) * fix replacing variables on imported files * refactored replaceEnvVars to ensure it is always called * Use byte slices for easier use Co-authored-by: Matt Holt --- caddyconfig/caddyfile/dispenser_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'caddyconfig/caddyfile/dispenser_test.go') diff --git a/caddyconfig/caddyfile/dispenser_test.go b/caddyconfig/caddyfile/dispenser_test.go index 494db36..86413a6 100755 --- a/caddyconfig/caddyfile/dispenser_test.go +++ b/caddyconfig/caddyfile/dispenser_test.go @@ -308,7 +308,7 @@ func TestDispenser_ArgErr_Err(t *testing.T) { } func newTestDispenser(input string) *Dispenser { - tokens, err := allTokens("Testfile", strings.NewReader(input)) + tokens, err := allTokens("Testfile", []byte(input)) if err != nil && err != io.EOF { log.Fatalf("getting all tokens from input: %v", err) } -- cgit v1.2.3