Merge pull request #43 from mnottale/yatee

Add support for yatee as an alternate renderer.

Author: mnottale

Gopkg.lock

@@ -5,6 +5,9 @@ E2E_NAME := $(BIN_NAME)-e2e
 # Enable experimental features. "on" or "off"
 EXPERIMENTAL := off
 
+# Comma-separated list of renderers
+RENDERERS := gotemplate
+
 TAG ?= $(shell git describe --always --dirty)
 COMMIT ?= $(shell git rev-parse --short HEAD)
 
@@ -22,7 +25,8 @@ IMAGE_BUILD_ARGS := \
 LDFLAGS := "-s -w \
 	-X $(PKG_NAME)/internal.GitCommit=$(COMMIT) \
 	-X $(PKG_NAME)/internal.Version=$(TAG)      \
-	-X $(PKG_NAME)/internal.Experimental=$(EXPERIMENTAL)"
+	-X $(PKG_NAME)/internal.Experimental=$(EXPERIMENTAL) \
+	-X $(PKG_NAME)/internal.Renderers=$(RENDERERS)"
 
 GO_BUILD := CGO_ENABLED=0 go build
 GO_TEST := CGO_ENABLED=0 go test

Makefile

@@ -5,4 +5,6 @@ var (
 	Debug = false
 	// Experimental enables experimental features if set to "on"
 	Experimental = "on"
+	// Renderers is a comma-separated list of enabled renderers
+	Renderers = "gotemplate"
 )

internal/config.go

@@ -4,13 +4,16 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
 
 	"github.com/docker/cli/cli/compose/loader"
 	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
+	"github.com/docker/yatee/yatee"
 	"gopkg.in/yaml.v2"
 )
 
@@ -69,6 +72,44 @@ func loadSettings(files []string) (map[string]interface{}, error) {
 	return res, nil
 }
 
+func applyRenderers(data []byte, renderers []string, settings map[string]interface{}) ([]byte, error) {
+	for _, r := range renderers {
+		switch r {
+		case "gotemplate":
+			tmpl, err := template.New("compose").Parse(string(data))
+			if err != nil {
+				return nil, err
+			}
+			yaml := bytes.NewBuffer(nil)
+			err = tmpl.Execute(yaml, settings)
+			if err != nil {
+				return nil, err
+			}
+			data = yaml.Bytes()
+		case "yatee":
+			yateed, err := yatee.Process(string(data), settings)
+			if err != nil {
+				return nil, err
+			}
+			m, err := yaml.Marshal(yateed)
+			if err != nil {
+				return nil, err
+			}
+			data = []byte(strings.Replace(string(m), "$", "$$", -1))
+		}
+	}
+	return data, nil
+}
+
+func contains(list []string, needle string) bool {
+	for _, e := range list {
+		if e == needle {
+			return true
+		}
+	}
+	return false
+}
+
 // Render renders the Compose file for this app, merging in settings files, other compose files, end env
 func Render(appname string, composeFiles []string, settingsFile []string, env map[string]string) (*composetypes.Config, error) {
 	appname, cleanup, err := packager.Extract(appname)
@@ -121,23 +162,28 @@ func Render(appname string, composeFiles []string, settingsFile []string, env ma
 	// prepend our app compose file to the list
 	composes := []string{filepath.Join(appname, "docker-compose.yml")}
 	composes = append(composes, composeFiles...)
+	renderers := strings.Split(internal.Renderers, ",")
+	if r, ok := os.LookupEnv("DOCKERAPP_RENDERERS"); ok {
+		rl := strings.Split(r, ",")
+		for _, r := range rl {
+			if !contains(renderers, r) {
+				return nil, fmt.Errorf("renderer '%s' not found", r)
+			}
+		}
+		renderers = rl
+	}
 	// go-template, then parse, then expand the compose files
 	configFiles := []composetypes.ConfigFile{}
 	for _, c := range composes {
 		data, err := ioutil.ReadFile(c)
 		if err != nil {
 			return nil, err
 		}
-		tmpl, err := template.New("compose").Parse(string(data))
-		if err != nil {
-			return nil, err
-		}
-		yaml := bytes.NewBuffer(nil)
-		err = tmpl.Execute(yaml, settings)
+		data, err = applyRenderers(data, renderers, settings)
 		if err != nil {
 			return nil, err
 		}
-		parsed, err := loader.ParseYAML(yaml.Bytes())
+		parsed, err := loader.ParseYAML(data)
 		if err != nil {
 			return nil, err
 		}