fold error responses into error value

Kong · Mar 16, 2023 · 237e1e7 · 237e1e7
1 parent 96716e6
commit 237e1e7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/kong/client.go b/kong/client.go
@@ -278,6 +278,16 @@ func (c *Client) Do(ctx context.Context, req *http.Request,
 	return response, err
 }
 
+func ErrorOrResponseError(res *Response, err error) error {
+	if err != nil {
+		return err
+	}
+	if res.StatusCode >= http.StatusBadRequest { // errors start at 400
+		return fmt.Errorf("unexpected response: %q", res.Status)
+	}
+	return nil
+}
+
 // SetDebugMode enables or disables logging of
 // the request to the logger set by SetLogger().
 // By default, debug logging is disabled.

diff --git a/kong/degraphql_route_service.go b/kong/degraphql_route_service.go
@@ -61,7 +61,7 @@ func (s *DegraphqlRouteService) Create(ctx context.Context, route *DegraphqlRout
 	}
 
 	var createdRoute DegraphqlRoute
-	_, err = s.client.Do(ctx, req, &createdRoute)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &createdRoute))
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +94,7 @@ func (s *DegraphqlRouteService) Get(
 	}
 
 	var route DegraphqlRoute
-	_, err = s.client.Do(ctx, req, &route)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &route))
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +128,7 @@ func (s *DegraphqlRouteService) Update(ctx context.Context, route *DegraphqlRout
 	}
 
 	var updatedRoute DegraphqlRoute
-	_, err = s.client.Do(ctx, req, &updatedRoute)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &updatedRoute))
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +160,7 @@ func (s *DegraphqlRouteService) Delete(
 		return err
 	}
 
-	_, err = s.client.Do(ctx, req, nil)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, nil))
 	return err
 }
 

diff --git a/kong/graphql_rate_limiting_cost_decoration_service.go b/kong/graphql_rate_limiting_cost_decoration_service.go
@@ -40,7 +40,7 @@ func (s *GraphqlRateLimitingCostDecorationService) Create(
 	}
 
 	var createdCostDeco GraphqlRateLimitingCostDecoration
-	_, err = s.client.Do(ctx, req, &createdCostDeco)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &createdCostDeco))
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +64,7 @@ func (s *GraphqlRateLimitingCostDecorationService) Get(
 	}
 
 	var costDeco GraphqlRateLimitingCostDecoration
-	_, err = s.client.Do(ctx, req, &costDeco)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &costDeco))
 	if err != nil {
 		return nil, err
 	}
@@ -89,7 +89,7 @@ func (s *GraphqlRateLimitingCostDecorationService) Update(
 	}
 
 	var updatedAPI GraphqlRateLimitingCostDecoration
-	_, err = s.client.Do(ctx, req, &updatedAPI)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, &updatedAPI))
 	if err != nil {
 		return nil, err
 	}
@@ -112,7 +112,7 @@ func (s *GraphqlRateLimitingCostDecorationService) Delete(
 		return err
 	}
 
-	_, err = s.client.Do(ctx, req, nil)
+	err = ErrorOrResponseError(s.client.Do(ctx, req, nil))
 	return err
 }