Merge pull request #485 from CircleCI-Public/runner-error-messages

CIRCLE-29921 Remove HTTP statuscode info from runner error messages

api/rest/client.go

@@ -77,7 +77,7 @@ func (c *Client) DoRequest(req *http.Request, resp interface{}) (statusCode int,
 		if err != nil {
 			return httpResp.StatusCode, err
 		}
-		return httpResp.StatusCode, &HTTPError{Code: httpResp.StatusCode, Err: errors.New(httpError.Message)}
+		return httpResp.StatusCode, &HTTPError{Code: httpResp.StatusCode, Message: httpError.Message}
 	}
 
 	if resp != nil {
@@ -95,19 +95,15 @@ func (c *Client) DoRequest(req *http.Request, resp interface{}) (statusCode int,
 
 type HTTPError struct {
 	Code int
-	Err  error
+	Message  string
 }
 
 func (e *HTTPError) Error() string {
 	if e.Code == 0 {
 		e.Code = http.StatusInternalServerError
 	}
-	if e.Err != nil {
-		return fmt.Sprintf("%v (%d-%s)", e.Err, e.Code, http.StatusText(e.Code))
+	if e.Message != "" {
+		return e.Message
 	}
 	return fmt.Sprintf("response %d (%s)", e.Code, http.StatusText(e.Code))
 }
-
-func (e *HTTPError) Unwrap() error {
-	return e.Err
-}

api/rest/client_test.go

@@ -66,7 +66,7 @@ func TestClient_DoRequest(t *testing.T) {
 
 			resp := make(map[string]interface{})
 			statusCode, err := c.DoRequest(r, &resp)
-			assert.Error(t, err, "the error message (400-Bad Request)")
+			assert.Error(t, err, "the error message")
 			assert.Equal(t, statusCode, http.StatusBadRequest)
 			assert.Check(t, cmp.DeepEqual(resp, map[string]interface{}{}))
 		})