Merge pull request #421 from nicks/nicks/errors

improve dotenv error messages
compose-spec · Jul 10, 2023 · 46dcfae · 46dcfae
2 parents 87ef292 + e5712ff
commit 46dcfae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/dotenv/parser.go b/dotenv/parser.go
@@ -123,8 +123,8 @@ loop:
 			}
 
 			return "", "", inherited, fmt.Errorf(
-				`line %d: unexpected character %q in variable name`,
-				p.line, string(rune))
+				`line %d: unexpected character %q in variable name %q`,
+				p.line, string(rune), strings.Split(src, "\n")[0])
 		}
 	}
 

diff --git a/dotenv/parser_test.go b/dotenv/parser_test.go
@@ -32,3 +32,9 @@ func TestParseBytes(t *testing.T) {
 		assert.Equal(t, value, out[key])
 	}
 }
+
+func TestParseVariable(t *testing.T) {
+	err := newParser().parse("%!(EXTRA string)=foo", map[string]string{}, nil)
+	assert.Error(t, err, "line 1: unexpected character \"%\" in variable name \"%!(EXTRA string)=foo\"")
+
+}
diff --git a/types/project.go b/types/project.go
@@ -507,7 +507,7 @@ func (p Project) ResolveServicesEnvironment(discardEnvFiles bool) error {
 
 			fileVars, err := dotenv.ParseWithLookup(bytes.NewBuffer(b), resolve)
 			if err != nil {
-				return err
+				return errors.Wrapf(err, "failed to read %s", envFile)
 			}
 			environment.OverrideBy(Mapping(fileVars).ToMappingWithEquals())
 		}