From aac7f6aab18ec0f16f8236cb2adb81db6cef781b Mon Sep 17 00:00:00 2001 From: redscaresu Date: Wed, 13 Jul 2022 10:21:02 +0100 Subject: [PATCH 1/2] simplify unmarshall --- pkg/client.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/client.go b/pkg/client.go index 9d52cf7..183e06f 100644 --- a/pkg/client.go +++ b/pkg/client.go @@ -10,7 +10,6 @@ import ( "net/http" "net/http/httputil" "os" - "strings" "text/template" "time" ) @@ -244,11 +243,10 @@ func (c *Client) MakeAPICall(verb string, r *Response, data []byte) error { } resp.Body.Close() respString := string(respBytes) - resp.Body = ioutil.NopCloser(strings.NewReader(respString)) if resp.StatusCode != http.StatusOK { return fmt.Errorf("unexpected response status %d: %q", resp.StatusCode, respString) } - if err = json.NewDecoder(resp.Body).Decode(&r); err != nil { + if err = json.Unmarshal(respBytes, &r); err != nil { return fmt.Errorf("decoding error for %q: %v", respString, err) } if r.Stat != "ok" { From b852d3a85ea67354c39201ff7e27d9b18859f91d Mon Sep 17 00:00:00 2001 From: redscaresu Date: Wed, 13 Jul 2022 15:45:43 +0100 Subject: [PATCH 2/2] remove respStrings --- pkg/client.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/client.go b/pkg/client.go index 183e06f..f4cc188 100644 --- a/pkg/client.go +++ b/pkg/client.go @@ -242,12 +242,11 @@ func (c *Client) MakeAPICall(verb string, r *Response, data []byte) error { return fmt.Errorf("reading response body: %v", err) } resp.Body.Close() - respString := string(respBytes) if resp.StatusCode != http.StatusOK { - return fmt.Errorf("unexpected response status %d: %q", resp.StatusCode, respString) + return fmt.Errorf("unexpected response status %d: %q", resp.StatusCode, respBytes) } if err = json.Unmarshal(respBytes, &r); err != nil { - return fmt.Errorf("decoding error for %q: %v", respString, err) + return fmt.Errorf("decoding error for %q: %v", respBytes, err) } if r.Stat != "ok" { e, _ := json.MarshalIndent(r.Error, "", " ")