Renaming method and more logging.

Author: Otávio Fernandes

pkg/vault-handler/dot_env.go

@@ -21,7 +21,7 @@ type DotEnv struct {
 
 // Prepare by checking if dot-env (".env") file already exists, read it's contents.
 func (d *DotEnv) Prepare() error {
-	if !fileExists(d.fullPath) {
+	if !FileExists(d.fullPath) {
 		d.logger.Info("Dot-env file is not found.")
 		return nil
 	}
@@ -43,7 +43,7 @@ func (d *DotEnv) Write() error {
 	defer f.Close()
 
 	for k, v := range d.data {
-		if _, err = f.WriteString(fmt.Sprintf("%s=\"%s\"\n", k, shellescape.Quote(v))); err != nil {
+		if _, err = f.WriteString(fmt.Sprintf("%s=%s\n", k, shellescape.Quote(v))); err != nil {
 			return err
 		}
 	}
@@ -73,11 +73,13 @@ func (d *DotEnv) envVarName(file *File) string {
 // loadFiles loop over array of Files, load contents
 func (d *DotEnv) loadFiles() {
 	for _, file := range d.files {
-		key := d.envVarName(file)
-		if _, found := d.data[key]; found {
-			d.logger.Warnf("Variable '%s' is already preset on '%s'!", key, d.fullPath)
+		k := d.envVarName(file)
+		if _, found := d.data[k]; found {
+			d.logger.Warnf("Variable '%s' is already preset on '%s'!", k, d.fullPath)
 		}
-		d.data[key] = string(file.Payload)
+		v := string(file.Payload)
+		d.logger.Tracef("Adding entry on dot-env: '%s'='%s'", k, v)
+		d.data[k] = v
 	}
 }
 

pkg/vault-handler/file.go

@@ -74,7 +74,7 @@ func (f *File) Read(baseDir string) error {
 	var err error
 
 	fullPath := f.FilePath(baseDir)
-	if !fileExists(fullPath) {
+	if !FileExists(fullPath) {
 		return fmt.Errorf("can't find file '%s'", fullPath)
 	}
 	if f.Payload, err = ioutil.ReadFile(fullPath); err != nil {

pkg/vault-handler/kubernetes.go

@@ -113,7 +113,7 @@ func (k *Kubernetes) localConfig() (*rest.Config, error) {
 	}
 	k.logger.Infof("Using kubernetes configuration: '%s'", k.kubeConfig)
 
-	if !fileExists(k.kubeConfig) {
+	if !FileExists(k.kubeConfig) {
 		return nil, fmt.Errorf("can't find kube-config file at: '%s'", k.kubeConfig)
 	}
 

pkg/vault-handler/utils.go

@@ -7,8 +7,8 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// fileExists Check if path exists, boolean return.
-func fileExists(path string) bool {
+// FileExists Check if path exists, boolean return.
+func FileExists(path string) bool {
 	if _, err := os.Stat(path); err != nil {
 		return false
 	}
@@ -23,7 +23,7 @@ func readFile(path string) []byte {
 	logger := log.WithField("path", path)
 	logger.Infof("Reading file bytes")
 
-	if !fileExists(path) {
+	if !FileExists(path) {
 		logger.Fatal("Can't find file")
 	}
 	if fileBytes, err = ioutil.ReadFile(path); err != nil {

pkg/vault-handler/utils_test.go

@@ -7,10 +7,10 @@ import (
 )
 
 func TestUtilsFileExists(t *testing.T) {
-	found := fileExists("../../test/manifest.yaml")
+	found := FileExists("../../test/manifest.yaml")
 	assert.True(t, found)
 
-	found = fileExists("../../should/not/exist.yaml")
+	found = FileExists("../../should/not/exist.yaml")
 	assert.False(t, found)
 }
 

test/e2e/vault_handler_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"testing"
 
 	log "github.com/sirupsen/logrus"
@@ -18,6 +19,7 @@ var config = &vh.Config{
 	VaultAddr:     "http://127.0.0.1:8200",
 	InputDir:      "../mock/input-dir",
 	OutputDir:     "/tmp",
+	DotEnv:        true,
 	VaultRoleID:   os.Getenv("VAULT_HANDLER_VAULT_ROLE_ID"),
 	VaultSecretID: os.Getenv("VAULT_HANDLER_VAULT_SECRET_ID"),
 	KubeConfig:    os.Getenv("KUBECONFIG"),
@@ -69,23 +71,18 @@ func readFile(t *testing.T, path string) []byte {
 	return fileBytes
 }
 
-func fileExists(path string) bool {
-	if _, err := os.Stat(path); err != nil {
-		return false
-	}
-	return true
-}
-
 func cleanUp(t *testing.T) {
+	_ = os.Remove(path.Join(config.OutputDir, ".env"))
+
 	loopOverManifests(t, func(t *testing.T, manifest *vh.Manifest) {
 		loopOverGroupSecrets(t, manifest, func(t *testing.T, group string, data *vh.SecretData) {
 			file := vh.NewFile(group, "", data, nil)
-			path := file.FilePath(config.OutputDir)
+			fullPath := file.FilePath(config.OutputDir)
 
-			t.Logf("Excluding file: '%s'", path)
+			t.Logf("Excluding file: '%s'", fullPath)
 
-			_ = os.Remove(path)
-			assert.False(t, fileExists(path))
+			_ = os.Remove(fullPath)
+			assert.False(t, vh.FileExists(fullPath))
 		})
 	})
 }