From dbbb4933c9e197b93d76ee743a7738b4b910b814 Mon Sep 17 00:00:00 2001 From: Michelle Noorali Date: Tue, 29 Mar 2016 17:40:57 -0600 Subject: [PATCH] chore(client): fix style errors --- pkg/client/client.go | 21 +++++++++++---------- pkg/client/deployments.go | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index 5bd593060..a3e4d5b25 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -226,27 +226,28 @@ func (r *Response) HTTPError() error { defer r.Body.Close() body, err := ioutil.ReadAll(r.Body) + if err != nil { + return err + } if contentType == "application/json" { httpErr := httputil.Error{} - json.Unmarshal(body, &httpErr) - return &HTTPError{ - StatusCode: r.StatusCode, - Message: httpErr.Msg, - URL: r.Request.URL, - } - } else { - if err != nil { + if err := json.Unmarshal(body, &httpErr); err != nil { return err } return &HTTPError{ StatusCode: r.StatusCode, - Message: string(body), + Message: httpErr.Msg, URL: r.Request.URL, } } - return nil + return &HTTPError{ + StatusCode: r.StatusCode, + Message: string(body), + URL: r.Request.URL, + } + } // HTTPError is an error caused by an unexpected HTTP status code. diff --git a/pkg/client/deployments.go b/pkg/client/deployments.go index dc355e4d8..e0c9ee36f 100644 --- a/pkg/client/deployments.go +++ b/pkg/client/deployments.go @@ -100,7 +100,7 @@ func (c *Client) DeleteDeployment(name string) (*common.Deployment, error) { return deployment, err } -// DescribDeployment describes the kubernetes resources of the supplied deployment +// DescribeDeployment describes the kubernetes resources of the supplied deployment func (c *Client) DescribeDeployment(name string) (*common.Deployment, error) { var deployment *common.Deployment //TODO: implement