Support the json error messages

storageos · Aug 22, 2017 · 976b8e1 · 976b8e1
1 parent f3d9bca
commit 976b8e1
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/client.go b/client.go
@@ -530,12 +530,24 @@ type Error struct {
 }
 
 func newError(resp *http.Response) *Error {
+	type jsonError struct {
+		Message string `json:"message"`
+	}
+
 	defer resp.Body.Close()
 	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return &Error{Status: resp.StatusCode, Message: fmt.Sprintf("cannot read body, err: %v", err)}
 	}
-	return &Error{Status: resp.StatusCode, Message: string(data)}
+
+	// attempt to unmarshal the error if in json format
+	jerr := &jsonError{}
+	err = json.Unmarshal(data, jerr)
+	if err != nil {
+		return &Error{Status: resp.StatusCode, Message: string(data)} // Failed, just return string
+	}
+
+	return &Error{Status: resp.StatusCode, Message: jerr.Message}
 }
 
 func (e *Error) Error() string {