Merge pull request #98 from mnottale/renderer-mustache

renderer: Add mustache as a template engine.

Author: mnottale

Gopkg.lock

@@ -77,9 +77,9 @@ func TestRenderBinary(t *testing.T) {
 	assert.NilError(t, err, "unable to get apps")
 	for _, app := range apps {
 		t.Log("testing", app.Name())
-		if (strings.Contains(app.Name(), "gotemplate") && !strings.Contains(renderers, "gotemplate")) ||
-			(strings.Contains(app.Name(), "yatee") && !strings.Contains(renderers, "yatee")) {
-			t.Skip("Required renderer not enabled.")
+		if !checkRenderers(app.Name(), renderers) {
+			t.Log("Required renderer not enabled.")
+			continue
 		}
 		settings, overrides, env := gather(t, filepath.Join("render", app.Name()))
 		args := []string{

e2e/binary_test.go

@@ -0,0 +1,13 @@
+version: "3.4"
+services:
+{{#myapp.enable}}
+  enabledservice:
+    image: alpine:{{myapp.alpine_version}}
+    command: bash -c {{myapp.command1}} {{myapp.command2}} {{myapp.command3}}
+{{/myapp.enable}}
+{{#myapp.disable}}
+  disabledservice:
+    image: nginx
+{{/myapp.disable}}
+  other:
+    image: nginx

e2e/render/template-mustache.dockerapp/docker-compose.yml

@@ -0,0 +1,2 @@
+myapp.command3: bam
+myapp.disable: "false"

e2e/render/template-mustache.dockerapp/env.yml

@@ -0,0 +1,12 @@
+version: "3.4"
+services:
+  enabledservice:
+    command:
+    - bash
+    - -c
+    - cat
+    - bar
+    - bam
+    image: alpine:latest
+  other:
+    image: nginx

e2e/render/template-mustache.dockerapp/expected.txt

@@ -0,0 +1,9 @@
+version: 0.1.0
+name: myapp
+description: ""
+maintainers:
+  - name: bearclaw
+    email: [email protected]
+targets:
+  swarm: true
+  kubernetes: true

e2e/render/template-mustache.dockerapp/metadata.yml

@@ -0,0 +1,3 @@
+myapp:
+  command2: bar
+  command3: baz

e2e/render/template-mustache.dockerapp/settings-0.yml

@@ -0,0 +1,5 @@
+myapp:
+  alpine_version: latest
+  command1: cat
+  command2: foo
+  enable: true

e2e/render/template-mustache.dockerapp/settings.yml

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/renderer"
 
 	"github.com/gotestyourself/gotestyourself/assert"
@@ -41,6 +42,17 @@ func gather(t *testing.T, dir string) ([]string, []string, map[string]string) {
 	return settings, overrides, env
 }
 
+// checkRenderer returns false if appname requires a renderer that is not in enabled
+func checkRenderers(appname string, enabled string) bool {
+	renderers := []string{"gotemplate", "yatee", "mustache"}
+	for _, r := range renderers {
+		if strings.Contains(appname, r) && !strings.Contains(enabled, r) {
+			return false
+		}
+	}
+	return true
+}
+
 func checkResult(t *testing.T, result string, resultErr error, dir string) {
 	if resultErr != nil {
 		ee := filepath.Join(dir, "expectedError.txt")
@@ -60,6 +72,10 @@ func TestRender(t *testing.T) {
 	assert.NilError(t, err, "unable to get apps")
 	for _, app := range apps {
 		t.Log("testing", app.Name())
+		if !checkRenderers(app.Name(), internal.Renderers) {
+			t.Log("Required renderer not enabled.")
+			continue
+		}
 		settings, overrides, env := gather(t, filepath.Join("render", app.Name()))
 		// run the render
 		config, resultErr := renderer.Render(filepath.Join("render", app.Name()), overrides, settings, env)

e2e/render_test.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/cbroglie/mustache"
 	"github.com/docker/cli/cli/compose/loader"
 	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/lunchbox/internal"
@@ -132,6 +133,12 @@ func applyRenderers(data []byte, renderers []string, settings map[string]interfa
 				return nil, err
 			}
 			data = []byte(strings.Replace(string(m), "$", "$$", -1))
+		case "mustache":
+			mdata, err := mustache.Render(string(data), settings)
+			if err != nil {
+				return nil, err
+			}
+			data = []byte(mdata)
 		}
 	}
 	return data, nil