commit 49e200e1bf5862fe2a396ba4b3fa1646aa09e3ee
parent 9feb16b3670b92265319b98dbd2bdcb5d8f21db7
Author: Oliver Lowe <o@olowe.co>
Date: Thu, 3 Feb 2022 11:05:22 +1100
Remove unnecessary parseAPIResponse function
All this did was wrap the usual standard library JSON decode
procedure.
Diffstat:
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/icinga.go b/icinga.go
@@ -50,6 +50,7 @@
package icinga
import (
+ "encoding/json"
"errors"
"net/http"
)
@@ -92,8 +93,8 @@ func Permissions(c *Client) ([]string, error) {
return nil, errors.New(resp.Status)
}
defer resp.Body.Close()
- apiresp, err := parseAPIResponse(resp.Body)
- if err != nil {
+ var apiresp apiResponse
+ if err := json.NewDecoder(resp.Body).Decode(&apiresp); err != nil {
return nil, err
}
return apiresp.Results[0].Permissions, nil
diff --git a/response.go b/response.go
@@ -24,17 +24,9 @@ type response struct {
Error error
}
-func parseAPIResponse(r io.Reader) (apiResponse, error) {
+func parseResponse(r io.Reader) (*response, error) {
var apiresp apiResponse
if err := json.NewDecoder(r).Decode(&apiresp); err != nil {
- return apiResponse{}, err
- }
- return apiresp, nil
-}
-
-func parseResponse(r io.Reader) (*response, error) {
- apiresp, err := parseAPIResponse(r)
- if err != nil {
return nil, err
}
// Confusingly the top-level status field in an API response contains