Minor change to only include internal values for heredoc commands, since we'll parse whole structure in separate new structure

Author: sebastian-echeverria

parse.go

@@ -74,8 +74,11 @@ 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)
+			}
 		}
 
 		if len(child.Heredocs) != 0 {
@@ -84,7 +87,7 @@ 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+heredoc.Name+"\n")
+				cmd.Value = append(cmd.Value, heredoc.Content)
 			}
 		}
 

parse_test.go

@@ -133,7 +133,7 @@ EOF
 			StartLine: 1,
 			EndLine:   5,
 			Flags:     []string{},
-			Value:     []string{"<<EOF", "source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\nEOF\n"},
+			Value:     []string{"source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\n"},
 		},
 	}
 	assert.Equal(t, expected, cmds)
@@ -155,7 +155,7 @@ FILE2
 			StartLine: 1,
 			EndLine:   5,
 			Flags:     []string{},
-			Value:     []string{"<<FILE1", "<<FILE2", "/dest", "content 1\nFILE1\n", "content 2\nFILE2\n"},
+			Value:     []string{"content 1\n", "content 2\n"},
 		},
 	}
 	assert.Equal(t, expected, cmds)

tests/dockerfile_test.py

@@ -116,11 +116,9 @@ def test_heredoc_string_success():
         dockerfile.Command(
             cmd='RUN', sub_cmd=None, json=False, flags=(),
             value=(
-                '<<EOF',
                 'source $HOME/.bashrc && echo $HOME\n'
                 'echo "Hello" >> /hello\n'
-                'echo "World!" >> /hello\n'
-                'EOF\n',
+                'echo "World!" >> /hello\n',
             ),
             start_line=1, end_line=5, original=test_string,
         ),
@@ -140,13 +138,8 @@ def test_heredoc_string_multiple_success():
         dockerfile.Command(
             cmd='COPY', sub_cmd=None, json=False, flags=(),
             value=(
-                '<<FILE1',
-                '<<FILE2',
-                '/dest',
-                'content 1\n'
-                'FILE1\n',
-                'content 2\n'
-                'FILE2\n',
+                'content 1\n',
+                'content 2\n',
             ),
             start_line=1, end_line=5, original=test_string,
         ),