Merge pull request #139 from deploymenttheory/dev

Removed redundant code post refactor of api handler

Author: ShocOne

apiintegrations/apihandler/apihandler.go

@@ -15,7 +15,6 @@ type APIHandler interface {
 	ConstructAPIAuthEndpoint(instanceName string, endpointPath string, log logger.Logger) string
 	MarshalRequest(body interface{}, method string, endpoint string, log logger.Logger) ([]byte, error)
 	MarshalMultipartRequest(fields map[string]string, files map[string]string, log logger.Logger) ([]byte, string, error)
-	//HandleAPISuccessResponse(resp *http.Response, out interface{}, log logger.Logger) error
 	GetContentTypeHeader(method string, log logger.Logger) string
 	GetAcceptHeader() string
 	GetDefaultBaseDomain() string

apiintegrations/jamfpro/README.MD

@@ -9,7 +9,6 @@ The Jamf Pro API Handler is an integral component of the Go API HTTP Client, des
 - **Accept Header Management**: Generates a weighted `Accept` header to indicate the client's capability to process various MIME types, prioritizing XML for compatibility with the Classic API.
 - **Standard Headers**: Provides a set of standard headers required for API requests, including `Accept`, `Content-Type`, and `Authorization`.
 - **Request Marshaling**: Encodes request bodies into the appropriate format (XML or JSON) based on the target API endpoint, with support for multipart/form-data encoding for file uploads.
-- **Response Handling**: Processes API responses, decoding them into the desired data structures and handling binary data responses where applicable.
 
 The logic of this api handler is defined as follows:
 Classic API:
@@ -36,43 +35,4 @@ For responses (DELETE):
 - Handle response codes as response body lacks anything useful.
 Headers
 - Sets accept headers based on weighting. Jamf Pro API doesn't support XML, so MIME type is skipped and returns JSON
-- Set content header as application/json with edge case exceptions based on need.
-
-
-## Usage
-
-To utilize the Jamf Pro API Handler within the Go API HTTP Client, instantiate the client with the Jamf Pro-specific configuration:
-
-```go
-package main
-
-import (
-    "log"
-
-    "github.com/deploymenttheory/go-api-http-client/httpclient"
-    "github.com/deploymenttheory/go-api-http-client/apihandlers/jamfpro"
-)
-
-func main() {
-    // Configuration for the HTTP client specific to Jamf Pro
-    config := httpclient.ClientConfig{
-        Environment: httpclient.EnvironmentConfig{
-            InstanceName: "your-instance-name",
-            APIType:      "jamfpro", // Specify the API type as "jamfpro"
-        },
-        // Other configuration settings...
-    }
-
-    // Initialize the Jamf Pro API handler with the configuration
-    jamfHandler, err := jamfpro.LoadAPIHandler(config.Environment.APIType, config.Logger)
-    if err != nil {
-        log.Fatalf("Failed to initialize Jamf Pro API handler: %v", err)
-    }
-
-    // Use the handler for API interactions
-    // Example: Constructing an API resource endpoint
-    resourceURL := jamfHandler.ConstructAPIResourceEndpoint(config.Environment.InstanceName, "/path/to/resource", config.Logger)
-    log.Printf("Constructed Resource URL: %s", resourceURL)
-
-    // Proceed with making API calls using the constructed URLs and the configured HTTP client...
-}
+- Set content header as application/json with edge case exceptions based on need.

apiintegrations/jamfpro/jamfpro_api_response.go.back

@@ -388,61 +388,3 @@ func (c *Client) do(req *http.Request, log logger.Logger, method, endpoint strin
 
 	return resp, nil
 }
-
-// handleErrorResponse processes and logs errors from an HTTP response, allowing for a customizable error message.
-//
-// Parameters:
-// - resp: The *http.Response received from the server.
-// - log: An instance of a logger (conforming to the logger.Logger interface) for logging the error details.
-// - errorMessage: A custom error message that provides context about the error.
-// - method: The HTTP method used for the request, for logging purposes.
-// - endpoint: The endpoint the request was sent to, for logging purposes.
-//
-// Returns:
-// - An error object parsed from the HTTP response, indicating the nature of the failure.
-// func (c *Client) handleErrorResponse(resp *http.Response, out interface{}, log logger.Logger, method, endpoint string) error {
-// 	if err := c.APIHandler.HandleAPIErrorResponse(resp, out, log); err != nil {
-// 		log.Error("Failed to unmarshal HTTP response",
-// 			zap.String("method", method),
-// 			zap.String("endpoint", endpoint),
-// 			zap.Error(err),
-// 		)
-// 		return err
-// 	}
-// 	log.Info("HTTP request succeeded",
-// 		zap.String("method", method),
-// 		zap.String("endpoint", endpoint),
-// 		zap.Int("status_code", resp.StatusCode),
-// 	)
-// 	return nil
-// }
-
-// handleSuccessResponse unmarshals a successful HTTP response into the provided output parameter and logs the
-// success details. It's designed for use when the response indicates success (status code within 200-299).
-// The function logs the request's success and, in case of unmarshalling errors, logs the failure and returns the error.
-//
-// Parameters:
-// - resp: The *http.Response received from the server.
-// - out: A pointer to the variable where the unmarshalled response will be stored.
-// - log: An instance of a logger (conforming to the logger.Logger interface) for logging success or unmarshalling errors.
-// - method: The HTTP method used for the request, for logging purposes.
-// - endpoint: The endpoint the request was sent to, for logging purposes.
-//
-// Returns:
-// - nil if the response was successfully unmarshalled into the 'out' parameter, or an error if unmarshalling failed.
-// func (c *Client) handleSuccessResponse(resp *http.Response, out interface{}, log logger.Logger, method, endpoint string) error {
-// 	if err := c.APIHandler.HandleAPISuccessResponse(resp, out, log); err != nil {
-// 		log.Error("Failed to unmarshal HTTP response",
-// 			zap.String("method", method),
-// 			zap.String("endpoint", endpoint),
-// 			zap.Error(err),
-// 		)
-// 		return err
-// 	}
-// 	log.Info("HTTP request succeeded",
-// 		zap.String("method", method),
-// 		zap.String("endpoint", endpoint),
-// 		zap.Int("status_code", resp.StatusCode),
-// 	)
-// 	return nil
-// }

apiintegrations/msgraph/msgraph_api_response.go

@@ -46,9 +46,10 @@ func HandleAPISuccessResponse(resp *http.Response, out interface{}, log logger.L
 // handleDeleteRequest handles the special case for DELETE requests, where a successful response might not contain a body.
 func handleDeleteRequest(resp *http.Response, log logger.Logger) error {
 	if resp.StatusCode >= 200 && resp.StatusCode < 300 {
+		log.Info("Successfully processed DELETE request", zap.String("URL", resp.Request.URL.String()), zap.Int("Status Code", resp.StatusCode))
 		return nil
 	}
-	return log.Error("DELETE request failed", zap.Int("Status Code", resp.StatusCode))
+	return log.Error("DELETE request failed", zap.String("URL", resp.Request.URL.String()), zap.Int("Status Code", resp.StatusCode))
 }
 
 // readResponseBody reads and returns the body of an HTTP response. It logs an error if reading fails.