Remove renderers

Signed-off-by: Djordje Lukic <[email protected]>

Author: rumpl

Gopkg.lock

@@ -19,30 +19,8 @@ import (
 	"gotest.tools/fs"
 	"gotest.tools/golden"
 	"gotest.tools/icmd"
-	"gotest.tools/skip"
 )
 
-// Skipping experimental e2e test on rendering with templates, as it needs now to set
-// the DOCKERAPP_RENDERERS environment variable inside the invocation image,
-// and the only way to do it is to add a new parameter to the bundle.json.
-// This test should be unskipped or removed as soon as the templates are
-// not experimental anymore, or are removed.
-func TestRenderTemplates(t *testing.T) {
-	t.Skip("renderer templates tests")
-	skip.If(t, !hasExperimental, "experimental mode needed for this test")
-	appsPath := filepath.Join("testdata", "templates")
-	apps, err := ioutil.ReadDir(appsPath)
-	assert.NilError(t, err, "unable to get apps")
-	for _, app := range apps {
-		appPath := filepath.Join(appsPath, app.Name())
-		if !checkRenderers(app.Name(), renderers) {
-			t.Log("Required renderer not enabled")
-			continue
-		}
-		t.Run(app.Name(), testRenderApp(appPath, "DOCKERAPP_RENDERERS="+app.Name()))
-	}
-}
-
 func TestRender(t *testing.T) {
 	appsPath := filepath.Join("testdata", "render")
 	apps, err := ioutil.ReadDir(appsPath)

e2e/commands_test.go

@@ -21,17 +21,6 @@ func readFile(t *testing.T, path string) string {
 	return strings.Replace(string(content), "\r", "", -1)
 }
 
-// checkRenderers 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
-}
-
 // Container represents a docker container
 type Container struct {
 	image           string

e2e/helper_test.go

@@ -9,7 +9,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"testing"
 
 	"github.com/deislabs/cnab-go/credentials"
@@ -23,7 +22,6 @@ var (
 	e2ePath         = flag.String("e2e-path", ".", "Set path to the e2e directory")
 	dockerCliPath   = os.Getenv("DOCKERCLI_BINARY")
 	hasExperimental = false
-	renderers       = ""
 	dockerCli       dockerCliCommand
 )
 
@@ -128,8 +126,6 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 	hasExperimental = bytes.Contains(output, []byte("Experimental: on"))
-	i := strings.Index(string(output), "Renderers")
-	renderers = string(output)[i+10:]
 	os.Exit(m.Run())
 }