Formatting

Signed-off-by: Arkaitz Jimenez <arkaitzj@gmail.com>
This commit is contained in:
Arkaitz Jimenez 2022-08-16 15:15:34 +02:00
parent 684be0af50
commit 4553efdcf1
2 changed files with 12 additions and 13 deletions

View File

@ -19,7 +19,7 @@ func NewFileRenderer(readFile func(filename string) ([]byte, error), basePath st
Context: &Context{ Context: &Context{
basePath: basePath, basePath: basePath,
readFile: readFile, readFile: readFile,
readDir: os.ReadDir, readDir: os.ReadDir,
}, },
Data: data, Data: data,
} }
@ -32,7 +32,7 @@ func NewFirstPassRenderer(basePath string, data interface{}) *FileRenderer {
preRender: true, preRender: true,
basePath: basePath, basePath: basePath,
readFile: os.ReadFile, readFile: os.ReadFile,
readDir: os.ReadDir, readDir: os.ReadDir,
}, },
Data: data, Data: data,
} }

View File

@ -1,8 +1,8 @@
package helmfile package helmfile
import ( import (
"fmt"
"bytes" "bytes"
"fmt"
"os" "os"
"testing" "testing"
"text/template" "text/template"
@ -265,32 +265,31 @@ func (t *tmplE2e) load() {
var tmplE2eTest = tmplE2e{} var tmplE2eTest = tmplE2e{}
func TestFileRendering(t *testing.T) { func TestFileRendering(t *testing.T) {
tmplE2eTest.load() tmplE2eTest.load()
for _, tc := range tmplE2eTest.tcs { for _, tc := range tmplE2eTest.tcs {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
tc.setEnvs(t) tc.setEnvs(t)
tempDir, _ := os.MkdirTemp("./testdata", "test") tempDir, _ := os.MkdirTemp("./testdata", "test")
defer os.RemoveAll(tempDir) defer os.RemoveAll(tempDir)
filename := fmt.Sprintf("%s/%s.gotmpl", tempDir, tc.name) filename := fmt.Sprintf("%s/%s.gotmpl", tempDir, tc.name)
os.WriteFile(filename, []byte(tc.tmplString), 0644) os.WriteFile(filename, []byte(tc.tmplString), 0644)
fileRenderer := tmpl.NewFileRenderer(os.ReadFile, ".", tc.data) fileRenderer := tmpl.NewFileRenderer(os.ReadFile, ".", tc.data)
tmpl_bytes, err := fileRenderer.RenderToBytes(filename); tmpl_bytes, err := fileRenderer.RenderToBytes(filename)
if tc.wantErr { if tc.wantErr {
require.Error(t, err) require.Error(t, err)
} else { } else {
require.NoError(t, err) require.NoError(t, err)
} }
tmpl := string(tmpl_bytes); tmpl := string(tmpl_bytes)
require.Equal(t, tc.output, tmpl) require.Equal(t, tc.output, tmpl)
}) })
} }
} }
// TestTmplStrings tests the template string // TestTmplStrings tests the template string