Merge pull request #335 from vdemeester/fix-helm-generation

Fix helm generation

Author: Vincent Demeester

Gopkg.lock

@@ -240,9 +240,9 @@ func TestHelmBinary(t *testing.T) {
 	chart, _ := ioutil.ReadFile(dir.Join("helm.chart/Chart.yaml"))
 	values, _ := ioutil.ReadFile(dir.Join("helm.chart/values.yaml"))
 	stack, _ := ioutil.ReadFile(dir.Join("helm.chart/templates/stack.yaml"))
-	golden.Assert(t, string(chart), "helm-expected.chart/Chart.yaml")
-	golden.Assert(t, string(values), "helm-expected.chart/values.yaml")
-	golden.Assert(t, string(stack), "helm-expected.chart/templates/stack.yaml")
+	golden.Assert(t, string(chart), "helm-expected.chart/Chart.yaml", "chart file is wrong")
+	golden.Assert(t, string(values), "helm-expected.chart/values.yaml", "values file is wrong")
+	golden.Assert(t, string(stack), "helm-expected.chart/templates/stack.yaml", "stack file is wrong")
 }
 
 func TestHelmV1Beta1Binary(t *testing.T) {
@@ -252,9 +252,9 @@ func TestHelmV1Beta1Binary(t *testing.T) {
 	chart, _ := ioutil.ReadFile(dir.Join("helm.chart/Chart.yaml"))
 	values, _ := ioutil.ReadFile(dir.Join("helm.chart/values.yaml"))
 	stack, _ := ioutil.ReadFile(dir.Join("helm.chart/templates/stack.yaml"))
-	golden.Assert(t, string(chart), "helm-expected.chart/Chart.yaml")
-	golden.Assert(t, string(values), "helm-expected.chart/values.yaml")
-	golden.Assert(t, string(stack), "helm-expected.chart/templates/stack-v1beta1.yaml")
+	golden.Assert(t, string(chart), "helm-expected.chart/Chart.yaml", "chart file is wrong")
+	golden.Assert(t, string(values), "helm-expected.chart/values.yaml", "values file is wrong")
+	golden.Assert(t, string(stack), "helm-expected.chart/templates/stack-v1beta1.yaml", "stack file is wrong")
 }
 
 func TestHelmInvalidStackVersionBinary(t *testing.T) {

e2e/commands_test.go

@@ -44,7 +44,7 @@ with the appropriate content (value or template)
 */
 
 // Helm renders an app as an Helm Chart
-func Helm(appname string, composeFiles []string, settingsFile []string, env map[string]string, render bool, stackVersion string) error {
+func Helm(appname string, composeFiles []string, settingsFile []string, env map[string]string, shouldRender bool, stackVersion string) error {
 	targetDir := internal.AppNameFromDir(appname) + ".chart"
 	if err := os.MkdirAll(targetDir, 0755); err != nil {
 		return errors.Wrap(err, "failed to create Chart directory")
@@ -53,7 +53,7 @@ func Helm(appname string, composeFiles []string, settingsFile []string, env map[
 	if err != nil {
 		return err
 	}
-	if render {
+	if shouldRender {
 		return helmRender(appname, targetDir, composeFiles, settingsFile, env, stackVersion)
 	}
 	data, err := ioutil.ReadFile(filepath.Join(appname, internal.ComposeFileName))
@@ -64,7 +64,7 @@ func Helm(appname string, composeFiles []string, settingsFile []string, env map[
 	if err != nil {
 		return errors.Wrap(err, "failed to parse compose file")
 	}
-	vars := template.ExtractVariables(cfgMap)
+	vars := template.ExtractVariables(cfgMap, render.Pattern)
 	// FIXME(vdemeester): remove the need to create this slice
 	variables := []string{}
 	for k := range vars {

internal/helm/helm.go

@@ -12,6 +12,7 @@ import (
 	"text/template"
 
 	"github.com/docker/app/internal"
+	"github.com/docker/app/internal/render"
 	"github.com/docker/app/internal/types"
 	"github.com/docker/cli/cli/compose/loader"
 	dtemplate "github.com/docker/cli/cli/compose/template"
@@ -128,7 +129,7 @@ func initFromComposeFile(name string, composeFile string) error {
 			}
 		}
 	}
-	vars := dtemplate.ExtractVariables(cfgMap)
+	vars := dtemplate.ExtractVariables(cfgMap, render.Pattern)
 	needsFilling := false
 	for k, v := range vars {
 		if _, ok := settings[k]; !ok {

internal/packager/init.go

@@ -34,7 +34,8 @@ var (
 		delimiter, delimiter, substitution, substitution,
 	)
 
-	pattern = regexp.MustCompile(patternString)
+	// Pattern is the variable regexp pattern used to interpolate or extract variables when rendering
+	Pattern = regexp.MustCompile(patternString)
 )
 
 // Render renders the Compose file for this app, merging in settings files, other compose files, and env
@@ -109,7 +110,7 @@ func render(configFiles []composetypes.ConfigFile, finalEnv map[string]string) (
 }
 
 func substitute(template string, mapping composetemplate.Mapping) (string, error) {
-	return composetemplate.SubstituteWith(template, mapping, pattern, errorIfMissing)
+	return composetemplate.SubstituteWith(template, mapping, Pattern, errorIfMissing)
 }
 
 func errorIfMissing(substitution string, mapping composetemplate.Mapping) (string, bool, error) {