fix: Keep backward-compatibility broken after introduction of values file template (#257)

Fixes #249

state/state.go

@@ -12,10 +12,9 @@ import (
 	"strings"
 	"sync"
 
-	"bytes"
 	"regexp"
 
-	"github.com/roboll/helmfile/tmpl"
+	"github.com/roboll/helmfile/valuesfile"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
 )
@@ -98,16 +97,6 @@ type SetValue struct {
 	Values []string `yaml:"values"`
 }
 
-// CreateFromTemplateFile loads the helmfile from disk and processes the template
-func CreateFromTemplateFile(file string, logger *zap.SugaredLogger) (*HelmState, error) {
-	yamlBuf, err := RenderTemplateFileToBuffer(file)
-	if err != nil {
-		return nil, err
-	}
-
-	return CreateFromYaml(yamlBuf.Bytes(), file, logger)
-}
-
 func CreateFromYaml(content []byte, file string, logger *zap.SugaredLogger) (*HelmState, error) {
 	var state HelmState
 
@@ -130,19 +119,6 @@ func CreateFromYaml(content []byte, file string, logger *zap.SugaredLogger) (*He
 	return &state, nil
 }
 
-func RenderTemplateFileToBuffer(file string) (*bytes.Buffer, error) {
-	content, err := ioutil.ReadFile(file)
-	if err != nil {
-		return nil, err
-	}
-
-	return renderTemplateToBuffer(string(content))
-}
-
-func renderTemplateToBuffer(s string) (*bytes.Buffer, error) {
-	return tmpl.DefaultContext.RenderTemplateToBuffer(s)
-}
-
 func (state *HelmState) applyDefaultsTo(spec *ReleaseSpec) {
 	if state.Namespace != "" {
 		spec.Namespace = state.Namespace
@@ -698,17 +674,18 @@ func (state *HelmState) namespaceAndValuesFlags(helm helmexec.Interface, basePat
 				return nil, err
 			}
 
-			yamlBuf, err := RenderTemplateFileToBuffer(path)
-			if err != nil {
-
-				return nil, fmt.Errorf("failed to render [%s], because of %v", path, err)
-			}
 			valfile, err := ioutil.TempFile("", "values")
 			if err != nil {
 				return nil, err
 			}
 			defer valfile.Close()
-			yamlBytes := yamlBuf.Bytes()
+
+			r := valuesfile.NewRenderer(ioutil.ReadFile)
+			yamlBytes, err := r.RenderToBytes(path)
+			if err != nil {
+				return nil, err
+			}
+
 			if _, err := valfile.Write(yamlBytes); err != nil {
 				return nil, fmt.Errorf("failed to write %s: %v", valfile.Name(), err)
 			}

state/state_test.go

@@ -12,14 +12,6 @@ import (
 
 var logger = helmexec.NewLogger(os.Stdout, "warn")
 
-func renderTemplateToString(s string) (string, error) {
-	tplString, err := renderTemplateToBuffer(s)
-	if err != nil {
-		return "", err
-	}
-	return tplString.String(), nil
-}
-
 func TestReadFromYaml(t *testing.T) {
 	yamlFile := "example/path/to/yaml/file"
 	yamlContent := []byte(`releases:
@@ -520,122 +512,6 @@ func TestHelmState_flagsForUpgrade(t *testing.T) {
 	}
 }
 
-func Test_renderTemplateToString(t *testing.T) {
-	type args struct {
-		s    string
-		envs map[string]string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    string
-		wantErr bool
-	}{
-		{
-			name: "simple replacement",
-			args: args{
-				s: "{{ env \"HF_TEST_VAR\" }}",
-				envs: map[string]string{
-					"HF_TEST_VAR": "content",
-				},
-			},
-			want:    "content",
-			wantErr: false,
-		},
-		{
-			name: "two replacements",
-			args: args{
-				s: "{{ env \"HF_TEST_ALPHA\" }}{{ env \"HF_TEST_BETA\" }}",
-				envs: map[string]string{
-					"HF_TEST_ALPHA": "first",
-					"HF_TEST_BETA":  "second",
-				},
-			},
-			want:    "firstsecond",
-			wantErr: false,
-		},
-		{
-			name: "replacement and comment",
-			args: args{
-				s: "{{ env \"HF_TEST_ALPHA\" }}{{/* comment */}}",
-				envs: map[string]string{
-					"HF_TEST_ALPHA": "first",
-				},
-			},
-			want:    "first",
-			wantErr: false,
-		},
-		{
-			name: "global template function",
-			args: args{
-				s: "{{ env \"HF_TEST_ALPHA\" | len }}",
-				envs: map[string]string{
-					"HF_TEST_ALPHA": "abcdefg",
-				},
-			},
-			want:    "7",
-			wantErr: false,
-		},
-		{
-			name: "env var not set",
-			args: args{
-				s: "{{ env \"HF_TEST_NONE\" }}",
-				envs: map[string]string{
-					"HF_TEST_THIS": "first",
-				},
-			},
-			want: "",
-		},
-		{
-			name: "undefined function",
-			args: args{
-				s: "{{ env foo }}",
-				envs: map[string]string{
-					"foo": "bar",
-				},
-			},
-			wantErr: true,
-		},
-		{
-			name: "required env var",
-			args: args{
-				s: "{{ requiredEnv \"HF_TEST\" }}",
-				envs: map[string]string{
-					"HF_TEST": "value",
-				},
-			},
-			want:    "value",
-			wantErr: false,
-		},
-		{
-			name: "required env var not set",
-			args: args{
-				s:    "{{ requiredEnv \"HF_TEST_NONE\" }}",
-				envs: map[string]string{},
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for k, v := range tt.args.envs {
-				err := os.Setenv(k, v)
-				if err != nil {
-					t.Error("renderTemplateToString() could not set env var for testing")
-				}
-			}
-			got, err := renderTemplateToString(tt.args.s)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("renderTemplateToString() for %s error = %v, wantErr %v", tt.name, err, tt.wantErr)
-				return
-			}
-			if got != tt.want {
-				t.Errorf("renderTemplateToString() for %s = %v, want %v", tt.name, got, tt.want)
-			}
-		})
-	}
-}
-
 func Test_isLocalChart(t *testing.T) {
 	type args struct {
 		chart string