WZ-42693 - Add last status code to error message

- Add last status code to error message

Author: dany74q

client.go

@@ -816,13 +816,16 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
 
 	// this means CheckRetry thought the request was a failure, but didn't
 	// communicate why
+	errMsg := fmt.Sprintf("%s %s giving up after %d attempt(s)", req.Method, redactURL(req.URL), attempt)
+	if resp != nil {
+		errMsg += fmt.Sprintf(" [last statusCode: %d]", resp.StatusCode)
+	}
+
 	if err == nil {
-		return nil, fmt.Errorf("%s %s giving up after %d attempt(s)",
-			req.Method, redactURL(req.URL), attempt)
+		return nil, fmt.Errorf(errMsg)
 	}
 
-	return nil, fmt.Errorf("%s %s giving up after %d attempt(s): %w",
-		req.Method, redactURL(req.URL), attempt, err)
+	return nil, fmt.Errorf("%s: %w", errMsg, err)
 }
 
 // Try to read the response body so we can reuse this connection.

client_test.go

@@ -497,19 +497,19 @@ func TestClient_Do_fails(t *testing.T) {
 			url:  ts.URL,
 			name: "default_retry_policy",
 			cr:   DefaultRetryPolicy,
-			err:  "giving up after 3 attempt(s)",
+			err:  "giving up after 3 attempt(s) [last statusCode: 500]",
 		},
 		{
 			url:  serverUrlWithBasicAuth.String(),
 			name: "default_retry_policy_url_with_basic_auth",
 			cr:   DefaultRetryPolicy,
-			err:  redactURL(serverUrlWithBasicAuth) + " giving up after 3 attempt(s)",
+			err:  redactURL(serverUrlWithBasicAuth) + " giving up after 3 attempt(s) [last statusCode: 500]",
 		},
 		{
 			url:  ts.URL,
 			name: "error_propagated_retry_policy",
 			cr:   ErrorPropagatedRetryPolicy,
-			err:  "giving up after 3 attempt(s): unexpected HTTP status 500 Internal Server Error",
+			err:  "giving up after 3 attempt(s) [last statusCode: 500]: unexpected HTTP status 500 Internal Server Error",
 		},
 	}
 
@@ -787,7 +787,7 @@ func TestClient_CheckRetry(t *testing.T) {
 		t.Fatalf("CheckRetry called %d times, expected 1", called)
 	}
 
-	if err.Error() != fmt.Sprintf("GET %s giving up after 2 attempt(s): retryError", ts.URL) {
+	if err.Error() != fmt.Sprintf("GET %s giving up after 2 attempt(s) [last statusCode: 500]: retryError", ts.URL) {
 		t.Fatalf("Expected retryError, got:%v", err)
 	}
 }