Merge pull request #317 from dtan4/robust-env-file

Skip empty line and comment in env_file

Author: vdemeester

config/merge.go

@@ -125,18 +125,21 @@ func readEnvFile(resourceLookup ResourceLookup, inFile string, serviceData RawSe
 		scanner := bufio.NewScanner(bytes.NewBuffer(content))
 		for scanner.Scan() {
 			line := strings.TrimSpace(scanner.Text())
-			key := strings.SplitAfter(line, "=")[0]
 
-			found := false
-			for _, v := range vars {
-				if strings.HasPrefix(v, key) {
-					found = true
-					break
+			if len(line) > 0 && !strings.HasPrefix(line, "#") {
+				key := strings.SplitAfter(line, "=")[0]
+
+				found := false
+				for _, v := range vars {
+					if strings.HasPrefix(v, key) {
+						found = true
+						break
+					}
 				}
-			}
 
-			if !found {
-				vars = append(vars, line)
+				if !found {
+					vars = append(vars, line)
+				}
 			}
 		}
 

config/merge_fixtures_test.go

@@ -3,6 +3,7 @@ package config
 import (
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 	"testing"
 )
 
@@ -12,7 +13,7 @@ func TestMergeOnValidFixtures(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, file := range files {
-		if file.IsDir() {
+		if file.IsDir() || !strings.HasSuffix(file.Name(), ".yml") {
 			continue
 		}
 		data, err := ioutil.ReadFile(filepath.Join("testdata", file.Name()))

config/merge_test.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"io/ioutil"
 	"testing"
 )
 
@@ -15,6 +16,18 @@ func (n *NullLookup) ResolvePath(path, inFile string) string {
 	return ""
 }
 
+type FileLookup struct {
+}
+
+func (f *FileLookup) Lookup(file, relativeTo string) ([]byte, string, error) {
+	bytes, err := ioutil.ReadFile(file)
+	return bytes, file, err
+}
+
+func (f *FileLookup) ResolvePath(path, inFile string) string {
+	return ""
+}
+
 func TestExtendsInheritImage(t *testing.T) {
 	_, configV1, _, _, err := Merge(NewServiceConfigs(), nil, &NullLookup{}, "", []byte(`
 parent:
@@ -198,6 +211,44 @@ services:
 	}
 }
 
+func TestMergesEnvFile(t *testing.T) {
+	_, configV1, _, _, err := Merge(NewServiceConfigs(), nil, &FileLookup{}, "", []byte(`
+test:
+  image: foo
+  env_file:
+    - testdata/.env
+`), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, configV2, _, _, err := Merge(NewServiceConfigs(), nil, &FileLookup{}, "", []byte(`
+version: '2'
+services:
+  test:
+    image: foo
+    env_file:
+      - testdata/.env
+`), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, config := range []map[string]*ServiceConfig{configV1, configV2} {
+		test := config["test"]
+
+		if len(test.Environment) != 2 {
+			t.Fatal("env_file is not merged", test.Environment)
+		}
+
+		for _, environment := range test.Environment {
+			if (environment != "FOO=foo") && (environment != "BAR=bar") {
+				t.Fatal("Empty line and comment should be excluded", environment)
+			}
+		}
+	}
+}
+
 func TestRestartNo(t *testing.T) {
 	_, configV1, _, _, err := Merge(NewServiceConfigs(), nil, &NullLookup{}, "", []byte(`
 test:

config/testdata/.env

@@ -0,0 +1,4 @@
+# This is a comment line
+
+FOO=foo
+BAR=bar