Merge pull request #234 from deploymenttheory/dev-multipartfix

Dev multipartfix

Author: ShocOne

httpclient/multipartrequestwithretry.go

@@ -93,36 +93,36 @@ func (c *Client) DoMultiPartRequest(method, endpoint string, files map[string][]
 
 	url := c.APIHandler.ConstructAPIResourceEndpoint(endpoint, log)
 
-	var resp *http.Response
-	var requestErr error
+	// Create a context with timeout based on the custom timeout duration
+	ctx, cancel := context.WithTimeout(context.Background(), c.clientConfig.ClientOptions.Timeout.CustomTimeout.Duration())
+	defer cancel()
 
-	// Retry logic
-	maxRetries := 3
-	for attempt := 1; attempt <= maxRetries; attempt++ {
-		// Create a context with timeout based on the custom timeout duration
-		ctx, cancel := context.WithTimeout(context.Background(), c.clientConfig.ClientOptions.Timeout.CustomTimeout.Duration())
-		defer cancel()
+	body, contentType, err := createStreamingMultipartRequestBody(files, formDataFields, fileContentTypes, formDataPartHeaders, log)
+	if err != nil {
+		log.Error("Failed to create streaming multipart request body", zap.Error(err))
+		return nil, err
+	}
 
-		body, contentType, err := createStreamingMultipartRequestBody(files, formDataFields, fileContentTypes, formDataPartHeaders, log)
-		if err != nil {
-			log.Error("Failed to create streaming multipart request body", zap.Error(err))
-			return nil, err
-		}
+	req, err := http.NewRequestWithContext(ctx, method, url, body)
+	if err != nil {
+		log.Error("Failed to create HTTP request", zap.Error(err))
+		return nil, err
+	}
 
-		req, err := http.NewRequestWithContext(ctx, method, url, body)
-		if err != nil {
-			log.Error("Failed to create HTTP request", zap.Error(err))
-			return nil, err
-		}
+	cookiejar.ApplyCustomCookies(req, c.clientConfig.ClientOptions.Cookies.CustomCookies, c.Logger)
 
-		cookiejar.ApplyCustomCookies(req, c.clientConfig.ClientOptions.Cookies.CustomCookies, c.Logger)
+	req.Header.Set("Content-Type", contentType)
 
-		req.Header.Set("Content-Type", contentType)
+	headerHandler := headers.NewHeaderHandler(req, c.Logger, c.APIHandler, c.AuthTokenHandler)
+	headerHandler.SetRequestHeaders(endpoint)
+	headerHandler.LogHeaders(c.clientConfig.ClientOptions.Logging.HideSensitiveData)
 
-		headerHandler := headers.NewHeaderHandler(req, c.Logger, c.APIHandler, c.AuthTokenHandler)
-		headerHandler.SetRequestHeaders(endpoint)
-		headerHandler.LogHeaders(c.clientConfig.ClientOptions.Logging.HideSensitiveData)
+	var resp *http.Response
+	var requestErr error
 
+	// Retry logic
+	maxRetries := 3
+	for attempt := 1; attempt <= maxRetries; attempt++ {
 		startTime := time.Now()
 
 		resp, requestErr = c.httpClient.Do(req)
@@ -159,7 +159,26 @@ func (c *Client) DoMultiPartRequest(method, endpoint string, files map[string][]
 
 // createStreamingMultipartRequestBody creates a streaming multipart request body with the provided files and form fields.
 // This function constructs the body of a multipart/form-data request using an io.Pipe, allowing the request to be sent in chunks.
-// createStreamingMultipartRequestBody creates a streaming multipart request body with the provided files and form fields.
+// It supports custom content types and headers for each part of the multipart request, and logs the process for debugging
+// and monitoring purposes.
+
+// Parameters:
+// - files: A map where the key is the field name and the value is a slice of file paths to be included in the request.
+//   Each file path corresponds to a file that will be included in the multipart request.
+// - formDataFields: A map of additional form fields to be included in the multipart request, where the key is the field name
+//   and the value is the field value. These are regular form fields that accompany the file uploads.
+// - fileContentTypes: A map specifying the content type for each file part. The key is the field name and the value is the
+//   content type (e.g., "image/jpeg").
+// - formDataPartHeaders: A map specifying custom headers for each part of the multipart form data. The key is the field name
+//   and the value is an http.Header containing the headers for that part.
+// - log: An instance of a logger implementing the logger.Logger interface, used to log informational messages, warnings,
+//   and errors encountered during the construction of the multipart request body.
+
+// Returns:
+//   - io.Reader: The constructed multipart request body reader. This reader streams the multipart form data payload ready to be sent.
+//   - string: The content type of the multipart request body. This includes the boundary string used by the multipart writer.
+//   - error: An error object indicating failure during the construction of the multipart request body. This could be due to issues
+//     such as file reading errors or multipart writer errors.
 func createStreamingMultipartRequestBody(files map[string][]string, formDataFields map[string]string, fileContentTypes map[string]string, formDataPartHeaders map[string]http.Header, log logger.Logger) (io.Reader, string, error) {
 	pr, pw := io.Pipe()
 	writer := multipart.NewWriter(pw)