Fix ENV inst parsing with newline (#64)

mthalman · Nov 26, 2020 · 67393f0 · 67393f0
1 parent 8c17711
commit 67393f0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/DockerfileModel/DockerfileModel.Tests/EnvInstructionTests.cs b/src/DockerfileModel/DockerfileModel.Tests/EnvInstructionTests.cs
@@ -153,6 +153,20 @@ public static IEnumerable<object[]> ParseTestInput()
                     }
                 },
                 new EnvInstructionParseTestScenario
+                {
+                    Text = "ENV MY_NAME John\r\n",
+                    TokenValidators = new Action<Token>[]
+                    {
+                        token => ValidateKeyword(token, "ENV"),
+                        token => ValidateWhitespace(token, " "),
+                        token => ValidateAggregate<KeyValueToken<IdentifierToken, LiteralToken>>(token, "MY_NAME John",
+                            token => ValidateIdentifier(token, "MY_NAME"),
+                            token => ValidateWhitespace(token, " "),
+                            token => ValidateLiteral(token, "John")),
+                        token => ValidateNewLine(token, "\r\n")
+                    }
+                },
+                new EnvInstructionParseTestScenario
                 {
                     Text = "ENV MY_NAME=John",
                     TokenValidators = new Action<Token>[]

diff --git a/src/DockerfileModel/DockerfileModel/EnvInstruction.cs b/src/DockerfileModel/DockerfileModel/EnvInstruction.cs
@@ -83,10 +83,11 @@ from literal in LiteralWithVariables(escapeChar, whitespaceMode: WhitespaceMode.
             select literal.GetOrElse(new LiteralToken("", canContainVariables: true, escapeChar));
 
         private static Parser<IEnumerable<Token>> SingleVariableFormat(char escapeChar) =>
-            KeyValueToken<IdentifierToken, LiteralToken>.GetParser(
-                IdentifierToken(VariableRefFirstLetterParser, VariableRefTailParser, escapeChar: escapeChar),
-                LiteralWithVariables(escapeChar),
-                separator: ' ',
-                escapeChar: escapeChar).AsEnumerable();
+            ArgTokens(
+                KeyValueToken<IdentifierToken, LiteralToken>.GetParser(
+                    IdentifierToken(VariableRefFirstLetterParser, VariableRefTailParser, escapeChar: escapeChar),
+                    LiteralWithVariables(escapeChar),
+                    separator: ' ',
+                    escapeChar: escapeChar).AsEnumerable(), escapeChar);
     }
 }