Added support for properly parsing Value and Original for dockerfiles containing heredocs syntax, along with tests.

Author: sebastian-echeverria

parse.go

@@ -74,8 +74,16 @@ func ParseReader(file io.Reader) ([]Command, error) {
 		}
 
 		cmd.Json = child.Attributes["json"]
-		for n := child.Next; n != nil; n = n.Next {
-			cmd.Value = append(cmd.Value, n.Value)
+
+		if len(child.Heredocs) == 0 {
+			for n := child.Next; n != nil; n = n.Next {
+				cmd.Value = append(cmd.Value, n.Value)
+			}
+		} else {
+			for _, value := range child.Heredocs {
+				cmd.Value = append(cmd.Value, value.Content)
+				cmd.Original = cmd.Original + "\n" + value.Content + value.Name + "\n"
+			}
 		}
 
 		ret = append(ret, cmd)

parse_test.go

@@ -116,3 +116,25 @@ func TestParseFile(t *testing.T) {
 	}
 	assert.Equal(t, expected, cmds)
 }
+
+func TestParseReaderHeredocs(t *testing.T) {
+	dockerfile := `RUN <<EOF
+source $HOME/.bashrc && echo $HOME
+echo "Hello" >> /hello
+echo "World!" >> /hello
+EOF
+`
+	cmds, err := ParseReader(bytes.NewBufferString(dockerfile))
+	assert.Nil(t, err)
+	expected := []Command{
+		Command{
+			Cmd:       "RUN",
+			Original:  dockerfile,
+			StartLine: 1,
+			EndLine:   5,
+			Flags:     []string{},
+			Value:     []string{"source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\n"},
+		},
+	}
+	assert.Equal(t, expected, cmds)
+}

tests/dockerfile_test.py

@@ -101,3 +101,25 @@ def test_parse_file_success():
             start_line=2, end_line=2, original='CMD ["echo", "hi"]',
         ),
     )
+
+
+def test_heredoc_string_success():
+    test_string = (
+        'RUN <<EOF\n'
+        'source $HOME/.bashrc && echo $HOME\n'
+        'echo "Hello" >> /hello\n'
+        'echo "World!" >> /hello\n'
+        'EOF\n'
+    )
+    ret = dockerfile.parse_string(test_string)
+    assert ret == (
+        dockerfile.Command(
+            cmd='RUN', sub_cmd=None, json=False, flags=(),
+            value=(
+                'source $HOME/.bashrc && echo $HOME\n'
+                'echo "Hello" >> /hello\n'
+                'echo "World!" >> /hello\n',
+            ),
+            start_line=1, end_line=5, original=test_string,
+        ),
+    )