fix: clean up test cruft from prior implementation

CHANGELOG.md

@@ -47,11 +47,9 @@
 
 ## [v0.36.0]
 
-> Release date: 2023/01/20
+> Release date: 2023/01/23
 
-### Breaking changes
-
-- `NewAPIError()` now returns a go-kong APIError along with the original raw error body.
+- Added `NewAPIErrorWithRaw()` to return a go-kong APIError along with the original raw error body.
   [#237](https://github.com/Kong/go-kong/pull/237)
   [#267](https://github.com/Kong/go-kong/pull/267)
 

kong/consumer_service.go

@@ -104,7 +104,7 @@ func (s *ConsumerService) GetByCustomID(ctx context.Context,
 	}
 
 	if len(resp.Data) == 0 {
-		return nil, NewAPIError(http.StatusNotFound, "Not found", []byte{})
+		return nil, NewAPIError(http.StatusNotFound, "Not found")
 	}
 
 	return &resp.Data[0], nil

kong/developer_service.go

@@ -104,7 +104,7 @@ func (s *DeveloperService) GetByCustomID(ctx context.Context,
 	}
 
 	if len(resp.Data) == 0 {
-		return nil, NewAPIError(http.StatusNotFound, "Not found", []byte{})
+		return nil, NewAPIError(http.StatusNotFound, "Not found")
 	}
 
 	return &resp.Data[0], nil

kong/error.go

@@ -13,11 +13,10 @@ type APIError struct {
 	raw      []byte
 }
 
-func NewAPIError(code int, msg string, raw []byte) *APIError {
+func NewAPIError(code int, msg string) *APIError {
 	return &APIError{
 		httpCode: code,
 		message:  msg,
-		raw:      raw,
 	}
 }
 

kong/error_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestIsNotFoundErr(T *testing.T) {
 	assert := assert.New(T)
-	var e error = NewAPIError(404, "", []byte{})
+	var e error = NewAPIError(404, "")
 	assert.True(IsNotFoundErr(e))
 	assert.False(IsNotFoundErr(nil))
 
@@ -79,5 +79,5 @@ func (ft *forbiddenTransport) RoundTrip(req *http.Request) (*http.Response, erro
 	return nil, NewAPIError(
 		http.StatusForbidden,
 		"Enterprise license missing or expired",
-		[]byte(`{ "message": "Enterprise license missing or expired" }`))
+	)
 }

kong/response.go

@@ -35,5 +35,14 @@ func hasError(res *http.Response) error {
 	}
 
 	body, _ := io.ReadAll(res.Body) // TODO error in error?
-	return NewAPIError(res.StatusCode, messageFromBody(body), body)
+	return NewAPIError(res.StatusCode, messageFromBody(body))
+}
+
+func hasErrorRaw(res *http.Response) error {
+	if res.StatusCode >= 200 && res.StatusCode <= 399 {
+		return nil
+	}
+
+	body, _ := io.ReadAll(res.Body) // TODO error in error?
+	return NewAPIErrorWithRaw(res.StatusCode, messageFromBody(body), body)
 }

kong/response_test.go

@@ -10,6 +10,71 @@ import (
 )
 
 func TestHasError(T *testing.T) {
+	for _, tt := range []struct {
+		name     string
+		response http.Response
+		want     error
+	}{
+		{
+			name: "code 200",
+			response: http.Response{
+				StatusCode: 200,
+				Body:       io.NopCloser(strings.NewReader("")),
+			},
+		},
+		{
+			name: "code 404",
+			response: http.Response{
+				StatusCode: 404,
+				Body:       io.NopCloser(strings.NewReader(`{"message": "potayto pohtato", "some": "other field"}`)),
+			},
+			want: &APIError{
+				httpCode: 404,
+				message:  "potayto pohtato",
+			},
+		},
+		{
+			name: "code 404, message field missing",
+			response: http.Response{
+				StatusCode: 404,
+				Body:       io.NopCloser(strings.NewReader(`{"nothing": "nothing"}`)),
+			},
+			want: &APIError{
+				httpCode: 404,
+				message:  "",
+			},
+		},
+		{
+			name: "code 404, empty body",
+			response: http.Response{
+				StatusCode: 404,
+				Body:       io.NopCloser(strings.NewReader(``)),
+			},
+			want: &APIError{
+				httpCode: 404,
+				message:  "<failed to parse response body: unexpected end of JSON input>",
+			},
+		},
+		{
+			name: "code 404, unparseable json",
+			response: http.Response{
+				StatusCode: 404,
+				Body:       io.NopCloser(strings.NewReader(`This is not json`)),
+			},
+			want: &APIError{
+				httpCode: 404,
+				message:  "<failed to parse response body: invalid character 'T' looking for beginning of value>",
+			},
+		},
+	} {
+		T.Run(tt.name, func(T *testing.T) {
+			got := hasError(&tt.response)
+			assert.Equal(T, tt.want, got)
+		})
+	}
+}
+
+func TestHasErrorRaw(T *testing.T) {
 	for _, tt := range []struct {
 		name     string
 		response http.Response
@@ -72,7 +137,7 @@ func TestHasError(T *testing.T) {
 		},
 	} {
 		T.Run(tt.name, func(T *testing.T) {
-			got := hasError(&tt.response)
+			got := hasErrorRaw(&tt.response)
 			assert.Equal(T, tt.want, got)
 		})
 	}