Add headers to output

Simon Thulbourn · jen20 · commit 33d2afc26da8 · 2015-12-21T13:32:26.000-05:00
The original implmentation was missing headers to denote mime version &amp;
content transfer encoding, this caused issues with EC2.

Signed-off-by: Simon Thulbourn &lt;simon+github@thulbourn.com&gt;
diff --git a/builtin/providers/template/resource_cloudinit_config.go b/builtin/providers/template/resource_cloudinit_config.go
@@ -170,6 +170,7 @@ func renderPartsToWriter(parts cloudInitParts, writer io.Writer) error {
 	}
 
 	writer.Write([]byte(fmt.Sprintf("Content-Type: multipart/mixed; boundary=\"%s\"\n", mimeWriter.Boundary())))
+	writer.Write([]byte("MIME-Version: 1.0\r\n"))
 
 	for _, part := range parts {
 		header := textproto.MIMEHeader{}
@@ -179,6 +180,9 @@ func renderPartsToWriter(parts cloudInitParts, writer io.Writer) error {
 			header.Set("Content-Type", part.ContentType)
 		}
 
+		header.Set("MIME-Version", "1.0")
+		header.Set("Content-Transfer-Encoding", "7bit")
+
 		if part.Filename != "" {
 			header.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, part.Filename))
 		}

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ func renderPartsToWriter(parts cloudInitParts, writer io.Writer) error {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`writer.Write([]byte(fmt.Sprintf("Content-Type: multipart/mixed; boundary=\"%s\"\n", mimeWriter.Boundary())))`
	`173`	`+ writer.Write([]byte("MIME-Version: 1.0\r\n"))`
`173`	`174`
`174`	`175`	`for _, part := range parts {`
`175`	`176`	`header := textproto.MIMEHeader{}`
`@@ -179,6 +180,9 @@ func renderPartsToWriter(parts cloudInitParts, writer io.Writer) error {`
`179`	`180`	`header.Set("Content-Type", part.ContentType)`
`180`	`181`	`}`
`181`	`182`
	`183`	`+ header.Set("MIME-Version", "1.0")`
	`184`	`+ header.Set("Content-Transfer-Encoding", "7bit")`
	`185`	`+`
`182`	`186`	`if part.Filename != "" {`
`183`	`187`	header.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, part.Filename))
`184`	`188`	`}`