Fixed to support multiple heredocs, and to include initial line and heredoc separators in values

Author: sebastian-echeverria

parse.go

@@ -74,15 +74,17 @@ 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"
+		if len(child.Heredocs) != 0 {
+			// For heredocs, add heredocs extra lines to Original,
+			// and each content to the Value array.
+			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")
 			}
 		}
 

parse_test.go

@@ -133,7 +133,29 @@ EOF
 			StartLine: 1,
 			EndLine:   5,
 			Flags:     []string{},
-			Value:     []string{"source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\n"},
+			Value:     []string{"<<EOF", "source $HOME/.bashrc && echo $HOME\necho \"Hello\" >> /hello\necho \"World!\" >> /hello\nEOF\n"},
+		},
+	}
+	assert.Equal(t, expected, cmds)
+}
+
+func TestParseReaderHeredocsMultiple(t *testing.T) {
+	dockerfile := `COPY <<FILE1 <<FILE2 /dest
+content 1
+FILE1
+content 2
+FILE2
+`
+	cmds, err := ParseReader(bytes.NewBufferString(dockerfile))
+	assert.Nil(t, err)
+	expected := []Command{
+		Command{
+			Cmd:       "COPY",
+			Original:  dockerfile,
+			StartLine: 1,
+			EndLine:   5,
+			Flags:     []string{},
+			Value:     []string{"<<FILE1", "<<FILE2", "/dest", "content 1\nFILE1\n", "content 2\nFILE2\n"},
 		},
 	}
 	assert.Equal(t, expected, cmds)

tests/dockerfile_test.py

@@ -116,9 +116,37 @@ 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',
+                'echo "World!" >> /hello\n'
+                'EOF\n',
+            ),
+            start_line=1, end_line=5, original=test_string,
+        ),
+    )
+
+
+def test_heredoc_string_multiple_success():
+    test_string = (
+        'COPY <<FILE1 <<FILE2 /dest\n'
+        'content 1\n'
+        'FILE1\n'
+        'content 2\n'
+        'FILE2\n'
+    )
+    ret = dockerfile.parse_string(test_string)
+    assert ret == (
+        dockerfile.Command(
+            cmd='COPY', sub_cmd=None, json=False, flags=(),
+            value=(
+                '<<FILE1',
+                '<<FILE2',
+                '/dest',
+                'content 1\n'
+                'FILE1\n',
+                'content 2\n'
+                'FILE2\n',
             ),
             start_line=1, end_line=5, original=test_string,
         ),