From 0ac3aa24bf2e4ada9c26fd9ef5b7f0ae8c6b6cfb Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Mon, 22 Jan 2024 09:06:33 -0500 Subject: Use go-fsimpl to read from datasources (#1336) * Use go-fsimpl to read from datasources Signed-off-by: Dave Henderson * trying to fix windows bug Signed-off-by: Dave Henderson * attempts to fix some of the path madness Signed-off-by: Dave Henderson * remove 'HOME' from expected env vars Signed-off-by: Dave Henderson * more tweaks Signed-off-by: Dave Henderson * lint fix Signed-off-by: Dave Henderson --------- Signed-off-by: Dave Henderson --- render_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'render_test.go') diff --git a/render_test.go b/render_test.go index 45b22067..ab6f58f2 100644 --- a/render_test.go +++ b/render_test.go @@ -10,7 +10,7 @@ import ( "testing" "testing/fstest" - "github.com/hairyhenderson/gomplate/v4/data" + "github.com/hairyhenderson/go-fsimpl" "github.com/hairyhenderson/gomplate/v4/internal/datafs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -24,7 +24,11 @@ func TestRenderTemplate(t *testing.T) { _ = os.Chdir("/") fsys := fstest.MapFS{} - ctx := datafs.ContextWithFSProvider(context.Background(), datafs.WrappedFSProvider(fsys, "mem")) + fsp := fsimpl.NewMux() + fsp.Add(datafs.EnvFS) + fsp.Add(datafs.StdinFS) + fsp.Add(datafs.WrappedFSProvider(fsys, "mem", "")) + ctx := datafs.ContextWithFSProvider(context.Background(), fsp) // no options - built-in function tr := NewRenderer(Options{}) @@ -47,7 +51,7 @@ func TestRenderTemplate(t *testing.T) { "world": {URL: wu}, }, }) - ctx = data.ContextWithStdin(ctx, strings.NewReader("hello")) + ctx = datafs.ContextWithStdin(ctx, strings.NewReader("hello")) out = &bytes.Buffer{} err = tr.Render(ctx, "test", `{{ .hi | toUpper }} {{ (ds "world") | toUpper }}`, out) require.NoError(t, err) -- cgit v1.2.3