Fix envfile detection

+ The envfiles were not added!

see #8

TODO: what are the others properties to fix this way?

generator/color_test.go

@@ -1,8 +0,0 @@
-package generator
-
-import "testing"
-
-func TestColor(t *testing.T) {
-	Red("Red text")
-	Grey("Grey text")
-}

generator/main.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"katenary/compose"
 	"katenary/helm"
+	"katenary/logger"
 	"log"
 	"net/url"
 	"os"
@@ -63,12 +64,13 @@ func CreateReplicaObject(name string, s *compose.Service, linked map[string]*com
 
 // This function will try to yied deployment and services based on a service from the compose file structure.
 func parseService(name string, s *compose.Service, linked map[string]*compose.Service, ret chan interface{}) {
-	Magenta(ICON_PACKAGE+" Generating deployment for ", name)
+	logger.Magenta(ICON_PACKAGE+" Generating deployment for ", name)
 
 	o := helm.NewDeployment(name)
 
 	container := helm.NewContainer(name, s.Image, s.Environment, s.Labels)
 	prepareContainer(container, s, name)
+	prepareEnvFromFiles(name, s, container, ret)
 
 	// Set the container to the deployment
 	o.Spec.Template.Spec.Containers = []*helm.Container{container}
@@ -91,6 +93,7 @@ func parseService(name string, s *compose.Service, linked map[string]*compose.Se
 	for lname, link := range linked {
 		container := helm.NewContainer(lname, link.Image, link.Environment, link.Labels)
 		prepareContainer(container, link, lname)
+		prepareEnvFromFiles(lname, link, container, ret)
 		o.Spec.Template.Spec.Containers = append(o.Spec.Template.Spec.Containers, container)
 		o.Spec.Template.Spec.Volumes = append(o.Spec.Template.Spec.Volumes, prepareVolumes(name, lname, link, container, madePVC, ret)...)
 		o.Spec.Template.Spec.InitContainers = append(o.Spec.Template.Spec.InitContainers, prepareInitContainers(lname, link, container)...)
@@ -182,7 +185,7 @@ func prepareContainer(container *helm.Container, service *compose.Service, servi
 func generateServicesAndIngresses(name string, s *compose.Service) []interface{} {
 
 	ret := make([]interface{}, 0) // can handle helm.Service or helm.Ingress
-	Magenta(ICON_SERVICE+" Generating service for ", name)
+	logger.Magenta(ICON_SERVICE+" Generating service for ", name)
 	ks := helm.NewService(name)
 
 	for i, p := range s.Ports {
@@ -205,13 +208,13 @@ func generateServicesAndIngresses(name string, s *compose.Service) []interface{}
 		if err != nil {
 			log.Fatalf("The given port \"%v\" as ingress port in \"%s\" service is not an integer\n", v, name)
 		}
-		Cyanf(ICON_INGRESS+" Create an ingress for port %d on %s service\n", port, name)
+		logger.Cyanf(ICON_INGRESS+" Create an ingress for port %d on %s service\n", port, name)
 		ing := createIngress(name, port, s)
 		ret = append(ret, ing)
 	}
 
 	if len(s.Expose) > 0 {
-		Magenta(ICON_SERVICE+" Generating service for ", name+"-external")
+		logger.Magenta(ICON_SERVICE+" Generating service for ", name+"-external")
 		ks := helm.NewService(name + "-external")
 		ks.Spec.Type = "NodePort"
 		for _, p := range s.Expose {
@@ -322,10 +325,10 @@ func buildCMFromPath(path string) *helm.ConfigMap {
 				if err != nil {
 					fmt.Fprintf(os.Stderr, "An error occured reading volume path %s\n", err.Error())
 				} else {
-					ActivateColors = true
-					Yellowf("Warning, %s is a directory, at this time we only "+
+					logger.ActivateColors = true
+					logger.Yellowf("Warning, %s is a directory, at this time we only "+
 						"can create configmap for first level file list\n", f)
-					ActivateColors = false
+					logger.ActivateColors = false
 				}
 				continue
 			}
@@ -408,9 +411,9 @@ func prepareVolumes(deployment, name string, s *compose.Service, container *helm
 
 		if !isCM && (strings.HasPrefix(volname, ".") || strings.HasPrefix(volname, "/")) {
 			// local volume cannt be mounted
-			ActivateColors = true
-			Redf("You cannot, at this time, have local volume in %s deployment\n", name)
-			ActivateColors = false
+			logger.ActivateColors = true
+			logger.Redf("You cannot, at this time, have local volume in %s deployment\n", name)
+			logger.ActivateColors = false
 			continue
 		}
 		if isCM {
@@ -485,7 +488,7 @@ func prepareVolumes(deployment, name string, s *compose.Service, container *helm
 				"mountPath": volepath,
 			})
 
-			Yellow(ICON_STORE+" Generate volume values", volname, "for container named", name, "in deployment", deployment)
+			logger.Yellow(ICON_STORE+" Generate volume values", volname, "for container named", name, "in deployment", deployment)
 			locker.Lock()
 			if _, ok := VolumeValues[deployment]; !ok {
 				VolumeValues[deployment] = make(map[string]map[string]interface{})
@@ -637,16 +640,16 @@ func prepareEnvFromFiles(name string, s *compose.Service, container *helm.Contai
 		}
 		var store helm.InlineConfig
 		if !isSecret {
-			Bluef(ICON_CONF+" Generating configMap %s\n", cf)
+			logger.Bluef(ICON_CONF+" Generating configMap %s\n", cf)
 			store = helm.NewConfigMap(cf)
 		} else {
-			Bluef(ICON_SECRET+" Generating secret %s\n", cf)
+			logger.Bluef(ICON_SECRET+" Generating secret %s\n", cf)
 			store = helm.NewSecret(cf)
 		}
 		if err := store.AddEnvFile(envfile); err != nil {
-			ActivateColors = true
-			Red(err.Error())
-			ActivateColors = false
+			logger.ActivateColors = true
+			logger.Red(err.Error())
+			logger.ActivateColors = false
 			os.Exit(2)
 		}
 

generator/main_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"katenary/compose"
 	"katenary/helm"
+	"katenary/logger"
 	"os"
 	"path/filepath"
 	"strings"
@@ -91,6 +92,10 @@ volumes:
         driver: local
 `
 
+func init() {
+	logger.NOLOG = true
+}
+
 func setUp(t *testing.T) (string, *compose.Parser) {
 	p := compose.NewParser("", DOCKER_COMPOSE_YML)
 	p.Parse("testapp")

generator/utils.go

@@ -1,89 +0,0 @@
-package generator
-
-import (
-	"fmt"
-	"os"
-	"sync"
-)
-
-type Color int
-
-var ActivateColors = false
-
-const (
-	GREY Color = 30 + iota
-	RED
-	GREEN
-	YELLOW
-	BLUE
-	MAGENTA
-	CYAN
-)
-
-var waiter = sync.Mutex{}
-
-func color(c Color, args ...interface{}) {
-	if !ActivateColors {
-		fmt.Println(args...)
-		return
-	}
-	waiter.Lock()
-	fmt.Fprintf(os.Stdout, "\x1b[%dm", c)
-	fmt.Fprint(os.Stdout, args...)
-	fmt.Fprintf(os.Stdout, "\x1b[0m\n")
-	waiter.Unlock()
-}
-
-func colorf(c Color, format string, args ...interface{}) {
-	if !ActivateColors {
-		fmt.Printf(format, args...)
-		return
-	}
-	waiter.Lock()
-	fmt.Fprintf(os.Stdout, "\x1b[%dm", c)
-	fmt.Fprintf(os.Stdout, format, args...)
-	fmt.Fprintf(os.Stdout, "\x1b[0m")
-	waiter.Unlock()
-}
-
-func Grey(args ...interface{}) {
-	color(GREY, args...)
-}
-
-func Red(args ...interface{}) {
-	color(RED, args...)
-}
-func Green(args ...interface{}) {
-	color(GREEN, args...)
-}
-func Yellow(args ...interface{}) {
-	color(YELLOW, args...)
-}
-func Blue(args ...interface{}) {
-	color(BLUE, args...)
-}
-func Magenta(args ...interface{}) {
-	color(MAGENTA, args...)
-}
-func Greyf(format string, args ...interface{}) {
-	colorf(GREY, format, args...)
-}
-
-func Redf(format string, args ...interface{}) {
-	colorf(RED, format, args...)
-}
-func Greenf(format string, args ...interface{}) {
-	colorf(GREEN, format, args...)
-}
-func Yellowf(format string, args ...interface{}) {
-	colorf(YELLOW, format, args...)
-}
-func Bluef(format string, args ...interface{}) {
-	colorf(BLUE, format, args...)
-}
-func Magentaf(format string, args ...interface{}) {
-	colorf(MAGENTA, format, args...)
-}
-func Cyanf(format string, args ...interface{}) {
-	colorf(CYAN, format, args...)
-}