feat: Environment and Environment Values (#267)

Resolves #253
This commit is contained in:
KUOKA Yusuke
2018-08-31 22:59:27 +09:00
committed by GitHub
parent 7c793fdb88
commit ed0854a5c0
16 changed files with 509 additions and 217 deletions
+3 -2
View File
@@ -2,6 +2,7 @@ package valuesfile
import (
"fmt"
"github.com/roboll/helmfile/environment"
"github.com/roboll/helmfile/tmpl"
"strings"
)
@@ -11,10 +12,10 @@ type renderer struct {
tmplFileRenderer tmpl.FileRenderer
}
func NewRenderer(readFile func(filename string) ([]byte, error), basePath string) *renderer {
func NewRenderer(readFile func(filename string) ([]byte, error), basePath string, env environment.Environment) *renderer {
return &renderer{
readFile: readFile,
tmplFileRenderer: tmpl.NewFileRenderer(readFile, basePath),
tmplFileRenderer: tmpl.NewFileRenderer(readFile, basePath, env),
}
}
+3 -2
View File
@@ -2,6 +2,7 @@ package valuesfile
import (
"fmt"
"github.com/roboll/helmfile/environment"
"reflect"
"testing"
)
@@ -24,7 +25,7 @@ func TestRenderToBytes_Gotmpl(t *testing.T) {
return []byte(dataFileContent), nil
}
return nil, fmt.Errorf("unexpected filename: expected=%v or %v, actual=%s", dataFile, valuesTmplFile, filename)
}, "")
}, "", environment.EmptyEnvironment)
buf, err := r.RenderToBytes(valuesTmplFile)
if err != nil {
t.Errorf("unexpected error: %v", err)
@@ -49,7 +50,7 @@ func TestRenderToBytes_Yaml(t *testing.T) {
return []byte(valuesYamlContent), nil
}
return nil, fmt.Errorf("unexpected filename: expected=%v, actual=%s", valuesFile, filename)
}, "")
}, "", environment.EmptyEnvironment)
buf, err := r.RenderToBytes(valuesFile)
if err != nil {
t.Errorf("unexpected error: %v", err)