Fix file upload, needs second pass to make it pretty

Author: taybart

builder.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -32,10 +32,9 @@ func buildRequest(input metaRequest) (req request, err error) {
 			return
 		}
 
-		var body io.Reader
-		body, err = buildBody(input)
-		if err != nil {
-			err = fmt.Errorf("creating body %w", err)
+		body, bodyHeaders, bodyerr := buildBody(input)
+		if bodyerr != nil {
+			err = fmt.Errorf("creating body %w", bodyerr)
 			return
 		}
 		r, err = http.NewRequest(input.method, url, body)
@@ -46,14 +45,18 @@ func buildRequest(input metaRequest) (req request, err error) {
 		for header, value := range input.headers {
 			r.Header.Set(header, value)
 		}
+		for header, value := range bodyHeaders {
+			r.Header.Set(header, value)
+		}
 
 	}
 	req = request{
 		label:       input.label,
 		skip:        input.skip,
 		delay:       input.delay,
 		expectation: input.expectation,
-		r:           r,
+
+		r: r,
 	}
 
 	if !req.skip {
@@ -66,43 +69,38 @@ func buildRequest(input metaRequest) (req request, err error) {
 	return
 }
 
-func buildBody(input metaRequest) (body io.Reader, err error) {
-	if input.filename != "" {
-		file, err := os.Open(input.filename)
-		if err != nil {
-			return nil, err
-		}
-		fileContents, err := ioutil.ReadAll(file)
-		if err != nil {
-			return nil, err
-		}
-		fi, err := file.Stat()
-		if err != nil {
-			return nil, err
-		}
-		file.Close()
+func buildFileBody(input metaRequest) (body *bytes.Buffer, headers map[string]string, err error) {
+	file, err := os.Open(input.filepath)
+	if err != nil {
+		return
+	}
+	defer file.Close()
 
-		var b bytes.Buffer
-		writer := multipart.NewWriter(&b)
-		part, err := writer.CreateFormFile(input.filelabel, fi.Name())
-		if err != nil {
-			return nil, err
-		}
-		part.Write(fileContents)
+	body = &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+	part, err := writer.CreateFormFile(input.filelabel, filepath.Base(input.filepath))
+	if err != nil {
+		return
+	}
+	_, err = io.Copy(part, file)
 
-		// TODO Add fields somehow
-		/* for key, val := range params {
-			_ = writer.WriteField(key, val)
-		} */
-		err = writer.Close()
-		if err != nil {
-			return nil, err
-		}
-		body = &b
+	/* for key, val := range params {
+		_ = writer.WriteField(key, val)
+	} */
+	err = writer.Close()
+	if err != nil {
+		return
+	}
+
+	return body, map[string]string{"Content-Type": writer.FormDataContentType()}, err
+}
+
+func buildBody(input metaRequest) (body io.Reader, headers map[string]string, err error) {
+	if input.filepath != "" {
+		return buildFileBody(input)
 	}
 
-	// Assume json
-	// if input.body != "" && input.headers["Content-Type"] == "application/json" {
+	// unknown body
 	if input.body != "" {
 		body = strings.NewReader(input.body)
 		return
@@ -118,11 +116,11 @@ func isValidMetaRequest(req metaRequest) error {
 	if req.method == "" {
 		return fmt.Errorf("No method found in request")
 	}
-	if req.filename != "" && req.headers["Content-Type"] == "" {
+	if req.filepath != "" && req.headers["Content-Type"] == "" {
 		return fmt.Errorf("Content-Type not set for request with file")
 	}
-	if req.filename != "" && req.filelabel == "" {
-		return fmt.Errorf("file %s not labeled in request (ex file://path label)", req.filename)
+	if req.filepath != "" && req.filelabel == "" {
+		return fmt.Errorf("file %s not labeled in request (ex file://path label)", req.filepath)
 	}
 	return nil
 }

lex.go

@@ -32,7 +32,7 @@ type metaRequest struct {
 	method      string
 	path        string
 	body        string
-	filename    string
+	filepath    string
 	filelabel   string
 	delay       time.Duration
 	expectation expectation
@@ -214,9 +214,9 @@ func (l *lexer) parseBlock(block []string) (request, error) {
 			// fn := l.rxFile.FindString(line)
 			matches := l.rxFile.FindStringSubmatch(line)
 			if isValidFile(matches[1]) {
-				req.filename = matches[1]
+				req.filepath = matches[1]
 				req.filelabel = matches[2]
-				log.Debug("Got File", req.filename, req.filelabel)
+				log.Debug("Got File", req.filepath, req.filelabel)
 			}
 			state = stateHeaders
 		case l.rxLabel.MatchString(line):