Merge pull request #58 from deploymenttheory/dev

Dev

Author: ShocOne

apihandlers/jamfpro/jamfpro_api_url.go

@@ -21,14 +21,14 @@ func (j *JamfAPIHandler) SetBaseDomain() string {
 func (j *JamfAPIHandler) ConstructAPIResourceEndpoint(instanceName string, endpointPath string, log logger.Logger) string {
 	urlBaseDomain := j.SetBaseDomain()
 	url := fmt.Sprintf("https://%s%s%s", instanceName, urlBaseDomain, endpointPath)
-	j.Logger.Info(fmt.Sprintf("Constructed %s API resource endpoint URL", APIName), zap.String("URL", url))
+	j.Logger.Debug(fmt.Sprintf("Constructed %s API resource endpoint URL", APIName), zap.String("URL", url))
 	return url
 }
 
 // ConstructAPIAuthEndpoint constructs the full URL for a Jamf API auth endpoint path and logs the URL.
 func (j *JamfAPIHandler) ConstructAPIAuthEndpoint(instanceName string, endpointPath string, log logger.Logger) string {
 	urlBaseDomain := j.SetBaseDomain()
 	url := fmt.Sprintf("https://%s%s%s", instanceName, urlBaseDomain, endpointPath)
-	j.Logger.Info(fmt.Sprintf("Constructed %s API authentication URL", APIName), zap.String("URL", url))
+	j.Logger.Debug(fmt.Sprintf("Constructed %s API authentication URL", APIName), zap.String("URL", url))
 	return url
 }

errors/http_error_handling.go

@@ -54,7 +54,7 @@ func HandleAPIError(resp *http.Response, log logger.Logger) error {
 	if err != nil || errMsg == "" {
 		errMsg = fmt.Sprintf("Unexpected error with status code: %d", resp.StatusCode)
 		// Logging with structured fields
-		log.Warn("Failed to decode API error message, using default error message",
+		log.Error("Failed to decode API error message, using default error message",
 			zap.String("status", resp.Status),
 			zap.String("error_message", errMsg),
 		)
@@ -163,6 +163,10 @@ func IsNonRetryableStatusCode(resp *http.Response) bool {
 
 // IsRateLimitError checks if the provided response indicates a rate limit error.
 func IsRateLimitError(resp *http.Response) bool {
+	if resp == nil {
+		// If the response is nil, it cannot be a rate limit error.
+		return false
+	}
 	return resp.StatusCode == http.StatusTooManyRequests
 }
 

httpclient/httpclient_request.go

@@ -330,7 +330,7 @@ func (c *Client) executeHTTPRequest(req *http.Request, log logger.Logger, method
 	}
 
 	// Log the response status code for successful requests
-	log.Info("Request sent successfully",
+	log.Debug("Request sent successfully",
 		zap.String("method", method),
 		zap.String("endpoint", endpoint),
 		zap.Int("status_code", resp.StatusCode),