Better empty http response handling (#118)

* client.go: don't call Close() if resp.Body is nil

Signed-off-by: Kent R. Spillner <[email protected]>

* client.go: support HTTP 204 responses

On success, BitBucket's delete APIs return HTTP 204 (No Content).  Handle
such cases similarly to how we handle expected empty responses on file
uploads.

Signed-off-by: Kent R. Spillner <[email protected]>

Author: sl4mmy

client.go

@@ -307,7 +307,7 @@ func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{},
 	if err != nil {
 		return nil, err
 	}
-	if emptyResponse {
+	if emptyResponse || resBody == nil {
 		return nil, nil
 	}
 
@@ -328,24 +328,36 @@ func (c *Client) doRawRequest(req *http.Request, emptyResponse bool) (io.ReadClo
 		return nil, err
 	}
 
-	if (resp.StatusCode != http.StatusOK) && (resp.StatusCode != http.StatusCreated) {
+	if unexpectedHttpStatusCode(resp.StatusCode) {
 		resp.Body.Close()
 		return nil, fmt.Errorf(resp.Status)
 	}
 
-	if emptyResponse {
+	if emptyResponse || resp.StatusCode == http.StatusNoContent {
 		resp.Body.Close()
 		return nil, nil
 	}
 
 	if resp.Body == nil {
-		resp.Body.Close()
 		return nil, fmt.Errorf("response body is nil")
 	}
 
 	return resp.Body, nil
 }
 
+func unexpectedHttpStatusCode(statusCode int) bool {
+	switch statusCode {
+	case http.StatusOK:
+		return false
+	case http.StatusCreated:
+		return false
+	case http.StatusNoContent:
+		return false
+	default:
+		return true
+	}
+}
+
 func (c *Client) requestUrl(template string, args ...interface{}) string {
 
 	if len(args) == 1 && args[0] == "" {