Return contents of Value field to have, for the heredocs case, the parts of the first line of the command, which makes more sense

Author: sebastian-echeverria

parse.go

@@ -83,10 +83,8 @@ func ParseReader(file io.Reader) ([]Command, error) {
 
 		cmd.Json = child.Attributes["json"]
 
-		if len(child.Heredocs) == 0 {
-			for n := child.Next; n != nil; n = n.Next {
-				cmd.Value = append(cmd.Value, n.Value)
-			}
+		for n := child.Next; n != nil; n = n.Next {
+			cmd.Value = append(cmd.Value, n.Value)
 		}
 
 		if len(child.Heredocs) != 0 {
@@ -95,7 +93,6 @@ func ParseReader(file io.Reader) ([]Command, error) {
 			cmd.Original = cmd.Original + "\n"
 			for _, heredoc := range child.Heredocs {
 				cmd.Original = cmd.Original + heredoc.Content + heredoc.Name + "\n"
-				cmd.Value = append(cmd.Value, heredoc.Content)
 				cmd.Heredocs = append(cmd.Heredocs, Heredoc{Name: heredoc.Name,
 					FileDescriptor: heredoc.FileDescriptor,
 					Content:        heredoc.Content})

parse_test.go

@@ -133,7 +133,7 @@ EOF
 			StartLine: 1,
 			EndLine:   5,
 			Flags:     []string{},
-			Value:     []string{"source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\n"},
+			Value:     []string{"3<<EOF"},
 			Heredocs: []Heredoc{
 				Heredoc{
 					Name:           "EOF",
@@ -161,7 +161,7 @@ FILE2
 			StartLine: 1,
 			EndLine:   5,
 			Flags:     []string{},
-			Value:     []string{"content 1\n", "content 2\n"},
+			Value:     []string{"<<FILE1", "<<FILE2", "/dest"},
 			Heredocs: []Heredoc{
 				Heredoc{
 					Name:           "FILE1",

tests/dockerfile_test.py

@@ -116,9 +116,7 @@ def test_heredoc_string_success():
         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',
+                '3<<EOF',
             ),
             start_line=1, end_line=5, original=test_string,
             heredocs=(
@@ -147,8 +145,9 @@ def test_heredoc_string_multiple_success():
         dockerfile.Command(
             cmd='COPY', sub_cmd=None, json=False, flags=(),
             value=(
-                'content 1\n',
-                'content 2\n',
+                '<<FILE1',
+                '<<FILE2',
+                '/dest',
             ),
             start_line=1, end_line=5, original=test_string,
             heredocs=(