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/parse_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'caddyconfig/caddyfile/parse_test.go') diff --git a/caddyconfig/caddyfile/parse_test.go b/caddyconfig/caddyfile/parse_test.go index 640d0cd..62a3998 100755 --- a/caddyconfig/caddyfile/parse_test.go +++ b/caddyconfig/caddyfile/parse_test.go @@ -19,12 +19,11 @@ import ( "io/ioutil" "os" "path/filepath" - "strings" "testing" ) func TestAllTokens(t *testing.T) { - input := strings.NewReader("a b c\nd e") + input := []byte("a b c\nd e") expected := []string{"a", "b", "c", "d", "e"} tokens, err := allTokens("TestAllTokens", input) @@ -545,7 +544,10 @@ func TestEnvironmentReplacement(t *testing.T) { expect: "}{$", }, } { - actual := replaceEnvVars([]byte(test.input)) + actual, err := replaceEnvVars([]byte(test.input)) + if err != nil { + t.Fatal(err) + } if !bytes.Equal(actual, []byte(test.expect)) { t.Errorf("Test %d: Expected: '%s' but got '%s'", i, test.expect, actual) } -- cgit v1.2.3