chore: Refactor MarshalMultipartRequest to improve error handling and logging

Author: ShocOne

apiintegrations/jamfpro/jamfpro_api_request.go

@@ -56,6 +56,7 @@ func (j *JamfAPIHandler) MarshalRequest(body interface{}, method string, endpoin
 	return data, nil
 }
 
+// MarshalMultipartRequest creates a multipart request body for sending files and form fields in a single request.
 func (j *JamfAPIHandler) MarshalMultipartRequest(fields map[string]string, files map[string]string, log logger.Logger) ([]byte, string, string, error) {
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
@@ -68,7 +69,7 @@ func (j *JamfAPIHandler) MarshalMultipartRequest(fields map[string]string, files
 		}
 	}
 
-	// Add the files to the form data, using safeOpenFile to ensure secure file access
+	// Add the files to the form data
 	for formField, filePath := range files {
 		file, err := helpers.SafeOpenFile(filePath)
 		if err != nil {

httpclient/multipartrequest.go

@@ -3,10 +3,14 @@ package httpclient
 
 import (
 	"bytes"
+	"io"
+	"mime/multipart"
 	"net/http"
+	"path/filepath"
 
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
 	"github.com/deploymenttheory/go-api-http-client/headers"
+	"github.com/deploymenttheory/go-api-http-client/helpers"
 	"github.com/deploymenttheory/go-api-http-client/response"
 	"go.uber.org/zap"
 )
@@ -54,17 +58,65 @@ func (c *Client) DoMultipartRequest(method, endpoint string, fields map[string]s
 		return nil, err
 	}
 
-	// Marshal the multipart form data
-	requestData, contentType, logBody, err := c.APIHandler.MarshalMultipartRequest(fields, files, log)
-	if err != nil {
+	// Create a buffer to hold the multipart form data
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+
+	// Add the simple fields to the form data
+	for field, value := range fields {
+		log.Debug("Adding field to multipart request", zap.String("Field", field), zap.String("Value", value))
+		if err := writer.WriteField(field, value); err != nil {
+			return nil, err
+		}
+	}
+
+	// Add the files to the form data
+	for formField, filePath := range files {
+		file, err := helpers.SafeOpenFile(filePath)
+		if err != nil {
+			log.Error("Failed to open file securely", zap.String("file", filePath), zap.Error(err))
+			return nil, err
+		}
+		defer file.Close()
+
+		part, err := writer.CreateFormFile(formField, filepath.Base(filePath))
+		if err != nil {
+			return nil, err
+		}
+		log.Debug("Adding file to multipart request", zap.String("FormField", formField), zap.String("FilePath", filePath))
+		if _, err := io.Copy(part, file); err != nil {
+			return nil, err
+		}
+	}
+
+	// Close the writer to finish writing the multipart message
+	if err := writer.Close(); err != nil {
 		return nil, err
 	}
 
+	contentType := writer.FormDataContentType()
+	bodyBytes := body.Bytes()
+
+	// Extract the first and last parts of the body for logging
+	const logSegmentSize = 1024 // 1 KB
+	bodyLen := len(bodyBytes)
+	var logBody string
+	if bodyLen <= 2*logSegmentSize {
+		logBody = string(bodyBytes)
+	} else {
+		logBody = string(bodyBytes[:logSegmentSize]) + "..." + string(bodyBytes[bodyLen-logSegmentSize:])
+	}
+
+	// Log the boundary and a partial body for debugging
+	boundary := writer.Boundary()
+	log.Debug("Multipart boundary", zap.String("Boundary", boundary))
+	log.Debug("Multipart request body (partial)", zap.String("Body", logBody))
+
 	// Construct URL using the ConstructAPIResourceEndpoint function
 	url := c.APIHandler.ConstructAPIResourceEndpoint(endpoint, log)
 
 	// Create the request
-	req, err := http.NewRequest(method, url, bytes.NewBuffer(requestData))
+	req, err := http.NewRequest(method, url, bytes.NewBuffer(bodyBytes))
 	if err != nil {
 		return nil, err
 	}
@@ -73,13 +125,10 @@ func (c *Client) DoMultipartRequest(method, endpoint string, fields map[string]s
 	headerHandler := headers.NewHeaderHandler(req, c.Logger, c.APIHandler, c.AuthTokenHandler)
 
 	// Use HeaderManager to set headers
-	headerHandler.SetContentType(contentType) // Set correct content type with boundary
+	headerHandler.SetContentType(contentType)
 	headerHandler.SetRequestHeaders(endpoint)
 	headerHandler.LogHeaders(c.clientConfig.ClientOptions.Logging.HideSensitiveData)
 
-	// Log request details with the partial body
-	log.Debug("HTTP Request Details (partial body)", zap.String("Method", method), zap.String("URL", url), zap.String("Content-Type", contentType), zap.String("Body", logBody))
-
 	// Execute the request
 	resp, err := c.httpClient.Do(req)
 	if err != nil {