diff options
author | Mark Sargent <99003+sarge@users.noreply.github.com> | 2020-01-10 15:34:22 +1300 |
---|---|---|
committer | Matt Holt <mholt@users.noreply.github.com> | 2020-01-09 19:34:22 -0700 |
commit | 871abf1053e99274e7336db3143ca5eb17013e38 (patch) | |
tree | 533fc30739dcb56d6ea3ee7065e28983acd53ea5 /caddyconfig/caddyfile/dispenser_test.go | |
parent | 29315847a8e6c17503408ac74567942533fc3d48 (diff) |
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 <mholt@users.noreply.github.com>
Diffstat (limited to 'caddyconfig/caddyfile/dispenser_test.go')
-rwxr-xr-x | caddyconfig/caddyfile/dispenser_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |