Fixed more unit and integration tests

client_test.go

@@ -277,7 +277,7 @@ func TestDoRequest_Non2xxStatusCode(t *testing.T) {
 		t.Fatal("expected error, got nil")
 	}
 
-	httpError, ok := err.(Error)
+	httpError, ok := err.(*Error)
 	if !ok {
 		t.Fatalf("expected error to be of type Error, got %T", err)
 	}

errors.go

@@ -2,7 +2,6 @@ package linodego
 
 import (
 	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -99,8 +98,8 @@ func coupleAPIErrors(resp *http.Response, err error) (*http.Response, error) {
 			return nil, &Error{Code: resp.StatusCode, Message: msg}
 		}
 
-		var apiError APIError
-		if err := json.NewDecoder(resp.Body).Decode(&apiError); err != nil {
+		apiError, ok := getAPIError(resp)
+		if !ok {
 			return nil, NewError(fmt.Errorf("failed to decode response body: %w", err))
 		}
 

errors_test.go

@@ -203,7 +203,7 @@ func TestCoupleAPIErrors(t *testing.T) {
 			httpClient: ts.Client(),
 		}
 
-		expectedError := Error{
+		expectedError := &Error{
 			Code:    http.StatusInternalServerError,
 			Message: "Unexpected Content-Type: Expected: application/json, Received: text/html\nResponse body: " + rawResponse,
 		}
@@ -248,7 +248,7 @@ func TestCoupleAPIErrors(t *testing.T) {
 			},
 		}
 
-		expectedError := Error{
+		expectedError := &Error{
 			Code:    http.StatusBadGateway,
 			Message: http.StatusText(http.StatusBadGateway),
 		}

retries.go

@@ -119,17 +119,20 @@ func getAPIError(resp *http.Response) (*APIError, bool) {
 		return nil, false
 	}
 
-	// Create a buffer to hold the body
+	// Read the body into a byte slice
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, false
 	}
-	resp.Body = io.NopCloser(bytes.NewReader(body)) // Restore body
+	// Restore the body for potential further use
+	resp.Body = io.NopCloser(bytes.NewReader(body))
 
+	// Decode the body directly from the byte slice
 	var apiError APIError
 	err = json.Unmarshal(body, &apiError)
 	if err != nil {
 		return nil, false
 	}
+
 	return &apiError, true
 }