Merge pull request #323 from vdemeester/helm-refacto-cover

Some more `helm` package refactoring

Author: Vincent Demeester

internal/helm/helm.go

@@ -11,13 +11,13 @@ import (
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/docker/app/internal"
+	"github.com/docker/app/internal/helm/templateconversion"
+	"github.com/docker/app/internal/helm/templateloader"
+	"github.com/docker/app/internal/helm/templatev1beta2"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/internal/render"
 	"github.com/docker/app/internal/settings"
 	"github.com/docker/app/internal/slices"
-	"github.com/docker/app/internal/templateconversion"
-	"github.com/docker/app/internal/templateloader"
-	"github.com/docker/app/internal/templatev1beta2"
 	"github.com/docker/app/internal/types"
 	"github.com/docker/cli/cli/command/stack/kubernetes"
 	"github.com/docker/cli/cli/compose/loader"
@@ -46,7 +46,7 @@ with the appropriate content (value or template)
 // Helm renders an app as an Helm Chart
 func Helm(appname string, composeFiles []string, settingsFile []string, env map[string]string, render bool, stackVersion string) error {
 	targetDir := internal.AppNameFromDir(appname) + ".chart"
-	if err := os.Mkdir(targetDir, 0755); err != nil && !os.IsExist(err) {
+	if err := os.MkdirAll(targetDir, 0755); err != nil {
 		return errors.Wrap(err, "failed to create Chart directory")
 	}
 	err := makeChart(appname, targetDir)
@@ -207,13 +207,6 @@ func helmRender(appname string, targetDir string, composeFiles []string, setting
 	return ioutil.WriteFile(filepath.Join(targetDir, "templates", "stack.yaml"), stackData, 0644)
 }
 
-func typeMeta(stackVersion string) metav1.TypeMeta {
-	return metav1.TypeMeta{
-		Kind:       "stacks.compose.docker.com",
-		APIVersion: stackVersion,
-	}
-}
-
 func makeChart(appname, targetDir string) error {
 	metaFile := filepath.Join(appname, internal.MetadataFileName)
 	metaContent, err := ioutil.ReadFile(metaFile)
@@ -249,6 +242,13 @@ func makeChart(appname, targetDir string) error {
 	return ioutil.WriteFile(filepath.Join(targetDir, "Chart.yaml"), hmetadata, 0644)
 }
 
+func typeMeta(stackVersion string) metav1.TypeMeta {
+	return metav1.TypeMeta{
+		Kind:       "stacks.compose.docker.com",
+		APIVersion: stackVersion,
+	}
+}
+
 func objectMeta(appname string) metav1.ObjectMeta {
 	return metav1.ObjectMeta{
 		Name: internal.AppNameFromDir(appname),

internal/templateconversion/convert.go …ernal/helm/templateconversion/convert.gointernal/templateconversion/convert.go renamed to internal/helm/templateconversion/convert.go internal/templateconversion/convert.go renamed to internal/helm/templateconversion/convert.go

@@ -6,12 +6,13 @@ import (
 	"strconv"
 	"strings"
 
-	composeTypes "github.com/docker/app/internal/templatetypes"
-	v1beta2 "github.com/docker/app/internal/templatev1beta2"
+	"github.com/docker/app/internal/helm/templatetypes"
+	v1beta2 "github.com/docker/app/internal/helm/templatev1beta2"
+	"github.com/docker/cli/cli/compose/types"
 )
 
 // FromComposeConfig converts a compose.Config into a StackSpec
-func FromComposeConfig(c *composeTypes.Config) *v1beta2.StackSpec {
+func FromComposeConfig(c *templatetypes.Config) *v1beta2.StackSpec {
 	if c == nil {
 		return nil
 	}
@@ -29,7 +30,7 @@ func FromComposeConfig(c *composeTypes.Config) *v1beta2.StackSpec {
 	}
 }
 
-func fromComposeSecrets(s map[string]composeTypes.SecretConfig) map[string]v1beta2.SecretConfig {
+func fromComposeSecrets(s map[string]types.SecretConfig) map[string]v1beta2.SecretConfig {
 	if s == nil {
 		return nil
 	}
@@ -48,7 +49,7 @@ func fromComposeSecrets(s map[string]composeTypes.SecretConfig) map[string]v1bet
 	return m
 }
 
-func fromComposeConfigs(s map[string]composeTypes.ConfigObjConfig) map[string]v1beta2.ConfigObjConfig {
+func fromComposeConfigs(s map[string]types.ConfigObjConfig) map[string]v1beta2.ConfigObjConfig {
 	if s == nil {
 		return nil
 	}
@@ -67,7 +68,7 @@ func fromComposeConfigs(s map[string]composeTypes.ConfigObjConfig) map[string]v1
 	return m
 }
 
-func fromComposeServiceConfig(s composeTypes.ServiceConfig) v1beta2.ServiceConfig {
+func fromComposeServiceConfig(s templatetypes.ServiceConfig) v1beta2.ServiceConfig {
 	var userID *int64
 	if s.User != "" {
 		numerical, err := strconv.Atoi(s.User)
@@ -114,7 +115,7 @@ func fromComposeServiceConfig(s composeTypes.ServiceConfig) v1beta2.ServiceConfi
 	}
 }
 
-func fromComposePorts(ports []composeTypes.ServicePortConfig) []v1beta2.ServicePortConfig {
+func fromComposePorts(ports []templatetypes.ServicePortConfig) []v1beta2.ServicePortConfig {
 	if ports == nil {
 		return nil
 	}
@@ -130,7 +131,7 @@ func fromComposePorts(ports []composeTypes.ServicePortConfig) []v1beta2.ServiceP
 	return p
 }
 
-func fromComposeServiceSecrets(secrets []composeTypes.ServiceSecretConfig) []v1beta2.ServiceSecretConfig {
+func fromComposeServiceSecrets(secrets []templatetypes.ServiceSecretConfig) []v1beta2.ServiceSecretConfig {
 	if secrets == nil {
 		return nil
 	}
@@ -146,7 +147,7 @@ func fromComposeServiceSecrets(secrets []composeTypes.ServiceSecretConfig) []v1b
 	return c
 }
 
-func fromComposeServiceConfigs(configs []composeTypes.ServiceConfigObjConfig) []v1beta2.ServiceConfigObjConfig {
+func fromComposeServiceConfigs(configs []templatetypes.ServiceConfigObjConfig) []v1beta2.ServiceConfigObjConfig {
 	if configs == nil {
 		return nil
 	}
@@ -162,7 +163,7 @@ func fromComposeServiceConfigs(configs []composeTypes.ServiceConfigObjConfig) []
 	return c
 }
 
-func fromComposeHealthcheck(h *composeTypes.HealthCheckConfig) *v1beta2.HealthCheckConfig {
+func fromComposeHealthcheck(h *templatetypes.HealthCheckConfig) *v1beta2.HealthCheckConfig {
 	if h == nil {
 		return nil
 	}
@@ -174,7 +175,7 @@ func fromComposeHealthcheck(h *composeTypes.HealthCheckConfig) *v1beta2.HealthCh
 	}
 }
 
-func fromComposePlacement(p composeTypes.Placement) v1beta2.Placement {
+func fromComposePlacement(p types.Placement) v1beta2.Placement {
 	return v1beta2.Placement{
 		Constraints: fromComposeConstraints(p.Constraints),
 	}
@@ -222,14 +223,14 @@ func fromComposeConstraints(s []string) *v1beta2.Constraints {
 	return constraints
 }
 
-func fromComposeResources(r composeTypes.Resources) v1beta2.Resources {
+func fromComposeResources(r templatetypes.Resources) v1beta2.Resources {
 	return v1beta2.Resources{
 		Limits:       fromComposeResourcesResource(r.Limits),
 		Reservations: fromComposeResourcesResource(r.Reservations),
 	}
 }
 
-func fromComposeResourcesResource(r *composeTypes.Resource) *v1beta2.Resource {
+func fromComposeResourcesResource(r *templatetypes.Resource) *v1beta2.Resource {
 	if r == nil {
 		return nil
 	}
@@ -239,7 +240,7 @@ func fromComposeResourcesResource(r *composeTypes.Resource) *v1beta2.Resource {
 	}
 }
 
-func fromComposeUpdateConfig(u *composeTypes.UpdateConfig) *v1beta2.UpdateConfig {
+func fromComposeUpdateConfig(u *templatetypes.UpdateConfig) *v1beta2.UpdateConfig {
 	if u == nil {
 		return nil
 	}
@@ -248,7 +249,7 @@ func fromComposeUpdateConfig(u *composeTypes.UpdateConfig) *v1beta2.UpdateConfig
 	}
 }
 
-func fromComposeRestartPolicy(r *composeTypes.RestartPolicy) *v1beta2.RestartPolicy {
+func fromComposeRestartPolicy(r *types.RestartPolicy) *v1beta2.RestartPolicy {
 	if r == nil {
 		return nil
 	}
@@ -257,7 +258,7 @@ func fromComposeRestartPolicy(r *composeTypes.RestartPolicy) *v1beta2.RestartPol
 	}
 }
 
-func fromComposeServiceVolumeConfig(vs []composeTypes.ServiceVolumeConfig) []v1beta2.ServiceVolumeConfig {
+func fromComposeServiceVolumeConfig(vs []templatetypes.ServiceVolumeConfig) []v1beta2.ServiceVolumeConfig {
 	if vs == nil {
 		return nil
 	}