github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126265 from tnqn/fix-watch-error

Browse Source 
Enrich the error returned from Request.Watch method
This commit is contained in:
Kubernetes Prow Robot 2024-08-30 14:47:31 +01:00 committed by GitHub
commit fd58143ed2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/client-go/rest/request.go
View File

@ -752,8 +752,9 @@ func (r *Request) Watch(ctx context.Context) (watch.Interface, error) {
// the server must have sent us an error in 'err'
return true, nil
}
if result := r.transformResponse(resp, req); result.err != nil {
return true, result.err
result := r.transformResponse(resp, req)
if err := result.Error(); err != nil {
return true, err
}
return true, fmt.Errorf("for request %s, got status: %v", url, resp.StatusCode)
}()

40
staging/src/k8s.io/client-go/rest/request_test.go
View File

@ -977,7 +977,7 @@ func TestRequestWatch(t *testing.T) {
Err: true,
},
{
name: "server returns forbidden",
name: "server returns forbidden with json content",
Request: &Request{
c: &RESTClient{
content: defaultContentConfig(),
@ -986,41 +986,27 @@ func TestRequestWatch(t *testing.T) {
},
serverReturns: []responseErr{
{response: &http.Response{
Header: http.Header{"Content-Type": []string{"application/json"}},
StatusCode: http.StatusForbidden,
Body: io.NopCloser(bytes.NewReader([]byte{})),
Body: io.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), &metav1.Status{
Status: metav1.StatusFailure,
Message: "secrets is forbidden",
Reason: metav1.StatusReasonForbidden,
Code: http.StatusForbidden,
})))),
}, err: nil},
},
attemptsExpected: 1,
Expect: []watch.Event{
{
Type: watch.Error,
Object: &metav1.Status{
Status: "Failure",
Code: 500,
Reason: "InternalError",
Message: `an error on the server ("unable to decode an event from the watch stream: test error") has prevented the request from succeeding`,
Details: &metav1.StatusDetails{
Causes: []metav1.StatusCause{
{
Type: "UnexpectedServerResponse",
Message: "unable to decode an event from the watch stream: test error",
},
{
Type: "ClientWatchDecoding",
Message: "unable to decode an event from the watch stream: test error",
},
},
},
},
},
},
Err: true,
Err: true,
ErrFn: func(err error) bool {
if err.Error() != "secrets is forbidden" {
return false
}
return apierrors.IsForbidden(err)
},
},
{
name: "server returns forbidden",
name: "server returns forbidden without content",
Request: &Request{
c: &RESTClient{
content: defaultContentConfig(),