Move render-related code to renderer package

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

cmd/helm.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/lunchbox/packager"
+	"github.com/docker/lunchbox/renderer"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ var helmCmd = &cobra.Command{
 			}
 			d[kv[0]] = kv[1]
 		}
-		err := packager.Helm(args[0], helmComposeFiles, helmSettingsFile, d)
+		err := renderer.Helm(args[0], helmComposeFiles, helmSettingsFile, d)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/render.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/lunchbox/packager"
+	"github.com/docker/lunchbox/renderer"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
@@ -24,7 +24,7 @@ var renderCmd = &cobra.Command{
 			}
 			d[kv[0]] = kv[1]
 		}
-		rendered, err := packager.Render(args[0], renderComposeFiles, renderSettingsFile, d)
+		rendered, err := renderer.Render(args[0], renderComposeFiles, renderSettingsFile, d)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

e2e/render_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/lunchbox/packager"
+	"github.com/docker/lunchbox/renderer"
 
 	"github.com/gotestyourself/gotestyourself/assert"
 	"gopkg.in/yaml.v2"
@@ -43,7 +43,7 @@ func TestRender(t *testing.T) {
 			assert.NilError(t, err, "unable to unmarshal env")
 		}
 		// run the render
-		config, resultErr := packager.Render(path.Join("render", app.Name()), overrides, settings, env)
+		config, resultErr := renderer.Render(path.Join("render", app.Name()), overrides, settings, env)
 		var result string
 		if resultErr == nil {
 			var bytes []byte

packager/helm.go renamed to renderer/helm.go

@@ -1,4 +1,4 @@
-package packager
+package renderer
 
 import (
 	"io/ioutil"
@@ -7,7 +7,9 @@ import (
 
 	conversion "github.com/docker/cli/cli/command/stack/kubernetes"
 	"github.com/docker/cli/kubernetes/compose/v1beta2"
+	"github.com/docker/lunchbox/packager"
 	"github.com/docker/lunchbox/types"
+	"github.com/docker/lunchbox/utils"
 	yaml "gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -36,7 +38,7 @@ func toHelmMeta(meta *types.AppMetadata) (*helmMeta, error) {
 
 // Helm renders an app as an Helm Chart
 func Helm(appname string, composeFiles []string, settingsFile []string, env map[string]string) error {
-	appname, cleanup, err := Extract(appname)
+	appname, cleanup, err := packager.Extract(appname)
 	if err != nil {
 		return err
 	}
@@ -55,7 +57,7 @@ func Helm(appname string, composeFiles []string, settingsFile []string, env map[
 	if err != nil {
 		return err
 	}
-	targetDir := appName(appname) + ".helm"
+	targetDir := utils.AppNameFromDir(appname) + ".helm"
 	os.Mkdir(targetDir, 0755)
 	hmeta, err := toHelmMeta(&meta)
 	if err != nil {
@@ -77,7 +79,7 @@ func Helm(appname string, composeFiles []string, settingsFile []string, env map[
 			APIVersion: "v1beta2",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      appName(appname),
+			Name:      utils.AppNameFromDir(appname),
 			Namespace: "default", // FIXME
 		},
 		Spec: stackSpec,

packager/render.go renamed to renderer/render.go

@@ -1,4 +1,4 @@
-package packager
+package renderer
 
 import (
 	"bytes"
@@ -10,6 +10,7 @@ import (
 
 	"github.com/docker/cli/cli/compose/loader"
 	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/lunchbox/packager"
 	"gopkg.in/yaml.v2"
 )
 
@@ -70,7 +71,7 @@ func loadSettings(files []string) (map[string]interface{}, error) {
 
 // Render renders the composefile 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 := Extract(appname)
+	appname, cleanup, err := packager.Extract(appname)
 	if err != nil {
 		return nil, err
 	}