github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126091 from seans3/ws-err-extra-info

Browse Source 
Adds extra error information from response to bad handshake error when possible
This commit is contained in:
Kubernetes Prow Robot 2024-07-22 16:53:16 -07:00 committed by GitHub
commit f753a444a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/transport/websocket/roundtripper.go
View File

@ -111,6 +111,10 @@ func (rt *RoundTripper) RoundTrip(request *http.Request) (retResp *http.Response
wsConn, resp, err := dialer.DialContext(request.Context(), request.URL.String(), request.Header)
if err != nil {
if errors.Is(err, gwebsocket.ErrBadHandshake) {
// Enhance the error message with the response status if possible.
if resp != nil && len(resp.Status) > 0 {
err = fmt.Errorf("%w (%s)", err, resp.Status)
}
return nil, &httpstream.UpgradeFailureError{Cause: err}
}
return nil, err

3
staging/src/k8s.io/client-go/transport/websocket/roundtripper_test.go
View File

@ -87,7 +87,8 @@ func TestWebSocketRoundTripper_RoundTripperFails(t *testing.T) {
_, err = rt.RoundTrip(req)
// Ensure a "bad handshake" error is returned, since requested protocol is not supported.
require.Error(t, err)
assert.True(t, strings.Contains(err.Error(), "bad handshake"))
assert.True(t, strings.Contains(err.Error(), "websocket: bad handshake"))
assert.True(t, strings.Contains(err.Error(), "403 Forbidden"))
assert.True(t, httpstream.IsUpgradeFailure(err))
}