Browse Source

client: Client.checkResponseErr: change errorMessage to an error

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 year ago
parent
commit
87fff769f4
1 changed files with 4 additions and 5 deletions
  1. 4 5
      client/request.go

+ 4 - 5
client/request.go

@@ -227,18 +227,17 @@ func (cli *Client) checkResponseErr(serverResp serverResponse) error {
 		return fmt.Errorf("request returned %s for API route and version %s, check if the server supports the requested API version", http.StatusText(serverResp.statusCode), serverResp.reqURL)
 		return fmt.Errorf("request returned %s for API route and version %s, check if the server supports the requested API version", http.StatusText(serverResp.statusCode), serverResp.reqURL)
 	}
 	}
 
 
-	var errorMessage string
+	var daemonErr error
 	if serverResp.header.Get("Content-Type") == "application/json" && (cli.version == "" || versions.GreaterThan(cli.version, "1.23")) {
 	if serverResp.header.Get("Content-Type") == "application/json" && (cli.version == "" || versions.GreaterThan(cli.version, "1.23")) {
 		var errorResponse types.ErrorResponse
 		var errorResponse types.ErrorResponse
 		if err := json.Unmarshal(body, &errorResponse); err != nil {
 		if err := json.Unmarshal(body, &errorResponse); err != nil {
 			return errors.Wrap(err, "Error reading JSON")
 			return errors.Wrap(err, "Error reading JSON")
 		}
 		}
-		errorMessage = strings.TrimSpace(errorResponse.Message)
+		daemonErr = errors.New(strings.TrimSpace(errorResponse.Message))
 	} else {
 	} else {
-		errorMessage = strings.TrimSpace(string(body))
+		daemonErr = errors.New(strings.TrimSpace(string(body)))
 	}
 	}
-
-	return errors.Wrap(errors.New(errorMessage), "Error response from daemon")
+	return errors.Wrap(daemonErr, "Error response from daemon")
 }
 }
 
 
 func (cli *Client) addHeaders(req *http.Request, headers http.Header) *http.Request {
 func (cli *Client) addHeaders(req *http.Request, headers http.Header) *http.Request {