Merge pull request #137 from mnottale/update-yatee

Update yatee, fix type of memory in e2e tests, explicit none renderer for better error checking.

Author: mnottale

Makefile

@@ -6,7 +6,7 @@ E2E_NAME := $(BIN_NAME)-e2e
 EXPERIMENTAL := off
 
 # Comma-separated list of renderers
-RENDERERS := ""
+RENDERERS := "none"
 
 TAG ?= $(shell git describe --always --dirty)
 COMMIT ?= $(shell git rev-parse --short HEAD)

e2e/binary_test.go

@@ -233,9 +233,9 @@ func TestHelmBinary(t *testing.T) {
 	chart, _ := ioutil.ReadFile("helm.chart/Chart.yaml")
 	values, _ := ioutil.ReadFile("helm.chart/values.yaml")
 	stack, _ := ioutil.ReadFile("helm.chart/templates/stack.yaml")
-	golden.AssertBytes(t, chart, "helm-expected.chart/Chart.yaml")
-	golden.AssertBytes(t, values, "helm-expected.chart/values.yaml")
-	golden.AssertBytes(t, stack, "helm-expected.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")
 }
 
 func TestSplitMergeBinary(t *testing.T) {

e2e/helm.dockerapp/settings.yml

@@ -11,5 +11,5 @@ tty: true
 aport: 10000
 sport: 11000
 dport: 12000
-memory: 100000000
+memory: '100000000'
 timeout: 10s

e2e/testdata/helm-expected.chart/values.yaml

@@ -3,7 +3,7 @@ app:
   name: myapp
   version: 0.1.0
 dport: 12000
-memory: 100000000
+memory: "100000000"
 myapp:
   debug: false
   nginx_replicas: 2

renderer/render.go

@@ -139,6 +139,9 @@ func applyRenderers(data []byte, renderers []string, settings map[string]interfa
 				return nil, err
 			}
 			data = []byte(mdata)
+		case "none":
+		default:
+			return nil, fmt.Errorf("unknown renderer %s", r)
 		}
 	}
 	return data, nil
@@ -197,7 +200,7 @@ func Render(appname string, composeFiles []string, settingsFile []string, env ma
 	if r, ok := os.LookupEnv("DOCKERAPP_RENDERERS"); ok {
 		rl := strings.Split(r, ",")
 		for _, r := range rl {
-			if !contains(renderers, r) {
+			if r != "none" && !contains(renderers, r) {
 				return nil, fmt.Errorf("renderer '%s' not found", r)
 			}
 		}