chore: Refactor MarshalMultipartRequest to handle file contents as byte slices

Author: ShocOne

apiintegrations/apihandler/apihandler.go

@@ -14,7 +14,7 @@ type APIHandler interface {
 	ConstructAPIResourceEndpoint(endpointPath string, log logger.Logger) string
 	ConstructAPIAuthEndpoint(endpointPath string, log logger.Logger) string
 	MarshalRequest(body interface{}, method string, endpoint string, log logger.Logger) ([]byte, error)
-	MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log *zap.Logger) ([]byte, string, string, error)
+	MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log logger.Logger) ([]byte, string, string, error)
 	GetContentTypeHeader(method string, log logger.Logger) string
 	GetAcceptHeader() string
 	GetDefaultBaseDomain() string

apiintegrations/jamfpro/jamfpro_api_request.go

@@ -54,7 +54,7 @@ func (j *JamfAPIHandler) MarshalRequest(body interface{}, method string, endpoin
 }
 
 // MarshalMultipartRequest handles multipart form data encoding with secure file handling and returns the encoded body and content type.
-func (j *JamfAPIHandler) MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log *zap.Logger) ([]byte, string, string, error) {
+func (j *JamfAPIHandler) MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log logger.Logger) ([]byte, string, string, error) {
 	const snippetLength = 20
 	var b bytes.Buffer
 	writer := multipart.NewWriter(&b)

apiintegrations/msgraph/msgraph_api_request.go

@@ -28,7 +28,7 @@ func (g *GraphAPIHandler) MarshalRequest(body interface{}, method string, endpoi
 }
 
 // MarshalMultipartRequest handles multipart form data encoding with secure file handling and returns the encoded body and content type.
-func (g *GraphAPIHandler) MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log *zap.Logger) ([]byte, string, string, error) {
+func (g *GraphAPIHandler) MarshalMultipartRequest(formFields map[string]string, fileContents map[string][]byte, log logger.Logger) ([]byte, string, string, error) {
 	const snippetLength = 20
 	var b bytes.Buffer
 	writer := multipart.NewWriter(&b)

httpclient/multipartrequest.go

@@ -55,7 +55,7 @@ func (c *Client) DoMultipartRequest(method, endpoint string, fields map[string]s
 	}
 
 	// Marshal the multipart form data
-	requestData, contentType, err := c.APIHandler.MarshalMultipartRequest(fields, files, log)
+	requestData, contentType, snippet, err := c.APIHandler.MarshalMultipartRequest(fields, files, log)
 	if err != nil {
 		return nil, err
 	}
@@ -70,14 +70,15 @@ func (c *Client) DoMultipartRequest(method, endpoint string, fields map[string]s
 	}
 
 	// Initialize HeaderManager
-	//log.Debug("Setting Authorization header with token", zap.String("Token", c.Token))
 	headerHandler := headers.NewHeaderHandler(req, c.Logger, c.APIHandler, c.AuthTokenHandler)
 
 	// Use HeaderManager to set headers
 	headerHandler.SetContentType(contentType)
 	headerHandler.SetRequestHeaders(endpoint)
 	headerHandler.LogHeaders(c.clientConfig.ClientOptions.Logging.HideSensitiveData)
 
+	log.Debug("Multipart request details", zap.String("URL", url), zap.String("Method", method), zap.String("Snippet", snippet))
+
 	// Execute the request
 	resp, err := c.httpClient.Do(req)
 	if err != nil {