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

Change the signature of resthandler.err for upcoming watch changes

Browse Source 
Watch will need to be able to invoke scope.err, and it will not
have access to the go-restful req/res. Change to use the raw http
type now.
This commit is contained in:
Clayton Coleman 2016-01-30 17:58:15 -05:00
parent a9a65e70b0
commit 6e0ad75a6e
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
pkg/apiserver/resthandler.go
View File

@ -79,8 +79,8 @@ type RequestScope struct {
Subresource string Subresource string
} }
func (scope *RequestScope) err(err error, req *restful.Request, res *restful.Response) { func (scope *RequestScope) err(err error, w http.ResponseWriter, req *http.Request) {
errorNegotiated(err, scope.Serializer, scope.Kind.GroupVersion(), res.ResponseWriter, req.Request) errorNegotiated(err, scope.Serializer, scope.Kind.GroupVersion(), w, req)
} }
// getterFunc performs a get request with the given context and object name. The request // getterFunc performs a get request with the given context and object name. The request
@ -97,7 +97,7 @@ func getResourceHandler(scope RequestScope, getter getterFunc) restful.RouteFunc
w := res.ResponseWriter w := res.ResponseWriter
namespace, name, err := scope.Namer.Name(req) namespace, name, err := scope.Namer.Name(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
ctx := scope.ContextFunc(req) ctx := scope.ContextFunc(req)
@ -105,11 +105,11 @@ func getResourceHandler(scope RequestScope, getter getterFunc) restful.RouteFunc
result, err := getter(ctx, name, req) result, err := getter(ctx, name, req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
write(http.StatusOK, scope.Kind.GroupVersion(), scope.Serializer, result, w, req.Request) write(http.StatusOK, scope.Kind.GroupVersion(), scope.Serializer, result, w, req.Request)
@ -178,14 +178,14 @@ func ConnectResource(connecter rest.Connecter, scope RequestScope, admit admissi
w := res.ResponseWriter w := res.ResponseWriter
namespace, name, err := scope.Namer.Name(req) namespace, name, err := scope.Namer.Name(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
ctx := scope.ContextFunc(req) ctx := scope.ContextFunc(req)
ctx = api.WithNamespace(ctx, namespace) ctx = api.WithNamespace(ctx, namespace)
opts, subpath, subpathKey := connecter.NewConnectOptions() opts, subpath, subpathKey := connecter.NewConnectOptions()
if err := getRequestOptions(req, scope, opts, subpath, subpathKey); err != nil { if err := getRequestOptions(req, scope, opts, subpath, subpathKey); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if admit.Handles(admission.Connect) { if admit.Handles(admission.Connect) {
@ -198,13 +198,13 @@ func ConnectResource(connecter rest.Connecter, scope RequestScope, admit admissi
err = admit.Admit(admission.NewAttributesRecord(connectRequest, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Connect, userInfo)) err = admit.Admit(admission.NewAttributesRecord(connectRequest, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Connect, userInfo))
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
handler, err := connecter.Connect(ctx, name, opts, &responder{scope: scope, req: req, res: res}) handler, err := connecter.Connect(ctx, name, opts, &responder{scope: scope, req: req, res: res})
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
handler.ServeHTTP(w, req.Request) handler.ServeHTTP(w, req.Request)
@ -223,7 +223,7 @@ func (r *responder) Object(statusCode int, obj runtime.Object) {
} }
func (r *responder) Error(err error) { func (r *responder) Error(err error) {
r.scope.err(err, r.req, r.res) r.scope.err(err, r.res.ResponseWriter, r.req.Request)
} }
// ListResource returns a function that handles retrieving a list of resources from a rest.Storage object. // ListResource returns a function that handles retrieving a list of resources from a rest.Storage object.
@ -236,7 +236,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
namespace, err := scope.Namer.Namespace(req) namespace, err := scope.Namer.Namespace(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -253,7 +253,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
opts := api.ListOptions{} opts := api.ListOptions{}
if err := scope.ParameterCodec.DecodeParameters(req.Request.URL.Query(), scope.Kind.GroupVersion(), &opts); err != nil { if err := scope.ParameterCodec.DecodeParameters(req.Request.URL.Query(), scope.Kind.GroupVersion(), &opts); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -266,7 +266,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
if opts.FieldSelector, err = opts.FieldSelector.Transform(fn); err != nil { if opts.FieldSelector, err = opts.FieldSelector.Transform(fn); err != nil {
// TODO: allow bad request to set field causes based on query parameters // TODO: allow bad request to set field causes based on query parameters
err = errors.NewBadRequest(err.Error()) err = errors.NewBadRequest(err.Error())
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -282,7 +282,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
// and a field selector, since just the name is // and a field selector, since just the name is
// sufficient to narrow down the request to a // sufficient to narrow down the request to a
// single object. // single object.
scope.err(errors.NewBadRequest("both a name and a field selector provided; please provide one or the other."), req, res) scope.err(errors.NewBadRequest("both a name and a field selector provided; please provide one or the other."), res.ResponseWriter, req.Request)
return return
} }
opts.FieldSelector = nameSelector opts.FieldSelector = nameSelector
@ -291,7 +291,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
if (opts.Watch || forceWatch) && rw != nil { if (opts.Watch || forceWatch) && rw != nil {
watcher, err := rw.Watch(ctx, &opts) watcher, err := rw.Watch(ctx, &opts)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
// TODO: Currently we explicitly ignore ?timeout= and use only ?timeoutSeconds=. // TODO: Currently we explicitly ignore ?timeout= and use only ?timeoutSeconds=.
@ -311,13 +311,13 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
trace.Step("About to List from storage") trace.Step("About to List from storage")
result, err := r.List(ctx, &opts) result, err := r.List(ctx, &opts)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Listing from storage done") trace.Step("Listing from storage done")
numberOfItems, err := setListSelfLink(result, req, scope.Namer) numberOfItems, err := setListSelfLink(result, req, scope.Namer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Self-linking done") trace.Step("Self-linking done")
@ -347,7 +347,7 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
namespace, err = scope.Namer.Namespace(req) namespace, err = scope.Namer.Namespace(req)
} }
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -357,14 +357,14 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
gv := scope.Kind.GroupVersion() gv := scope.Kind.GroupVersion()
s, err := negotiateInputSerializer(req.Request, scope.Serializer) s, err := negotiateInputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
decoder := scope.Serializer.DecoderToVersion(s, unversioned.GroupVersion{Group: gv.Group, Version: runtime.APIVersionInternal}) decoder := scope.Serializer.DecoderToVersion(s, unversioned.GroupVersion{Group: gv.Group, Version: runtime.APIVersionInternal})
body, err := readBody(req.Request) body, err := readBody(req.Request)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -374,12 +374,12 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
obj, gvk, err := decoder.Decode(body, &defaultGVK, original) obj, gvk, err := decoder.Decode(body, &defaultGVK, original)
if err != nil { if err != nil {
err = transformDecodeError(typer, err, original, gvk) err = transformDecodeError(typer, err, original, gvk)
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if gvk.GroupVersion() != gv { if gvk.GroupVersion() != gv {
err = errors.NewBadRequest(fmt.Sprintf("the API version in the data (%s) does not match the expected API version (%v)", gvk.GroupVersion().String(), gv.String())) err = errors.NewBadRequest(fmt.Sprintf("the API version in the data (%s) does not match the expected API version (%v)", gvk.GroupVersion().String(), gv.String()))
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Conversion done") trace.Step("Conversion done")
@ -389,7 +389,7 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
err = admit.Admit(admission.NewAttributesRecord(obj, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Create, userInfo)) err = admit.Admit(admission.NewAttributesRecord(obj, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Create, userInfo))
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -403,13 +403,13 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
return out, err return out, err
}) })
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Object stored in database") trace.Step("Object stored in database")
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Self-link added") trace.Step("Self-link added")
@ -449,7 +449,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
namespace, name, err := scope.Namer.Name(req) namespace, name, err := scope.Namer.Name(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -458,7 +458,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
versionedObj, err := converter.ConvertToVersion(r.New(), scope.Kind.GroupVersion().String()) versionedObj, err := converter.ConvertToVersion(r.New(), scope.Kind.GroupVersion().String())
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -472,13 +472,13 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
patchJS, err := readBody(req.Request) patchJS, err := readBody(req.Request)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
s, ok := scope.Serializer.SerializerForMediaType("application/json", nil) s, ok := scope.Serializer.SerializerForMediaType("application/json", nil)
if !ok { if !ok {
scope.err(fmt.Errorf("no serializer defined for JSON"), req, res) scope.err(fmt.Errorf("no serializer defined for JSON"), res.ResponseWriter, req.Request)
return return
} }
gv := scope.Kind.GroupVersion() gv := scope.Kind.GroupVersion()
@ -498,12 +498,12 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
result, err := patchResource(ctx, updateAdmit, timeout, versionedObj, r, name, patchType, patchJS, scope.Namer, codec) result, err := patchResource(ctx, updateAdmit, timeout, versionedObj, r, name, patchType, patchJS, scope.Namer, codec)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -624,7 +624,7 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
namespace, name, err := scope.Namer.Name(req) namespace, name, err := scope.Namer.Name(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
ctx := scope.ContextFunc(req) ctx := scope.ContextFunc(req)
@ -632,13 +632,13 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
body, err := readBody(req.Request) body, err := readBody(req.Request)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
s, err := negotiateInputSerializer(req.Request, scope.Serializer) s, err := negotiateInputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
defaultGVK := scope.Kind defaultGVK := scope.Kind
@ -647,18 +647,18 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
obj, gvk, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, original) obj, gvk, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, original)
if err != nil { if err != nil {
err = transformDecodeError(typer, err, original, gvk) err = transformDecodeError(typer, err, original, gvk)
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if gvk.GroupVersion() != defaultGVK.GroupVersion() { if gvk.GroupVersion() != defaultGVK.GroupVersion() {
err = errors.NewBadRequest(fmt.Sprintf("the API version in the data (%s) does not match the expected API version (%s)", gvk.GroupVersion(), defaultGVK.GroupVersion())) err = errors.NewBadRequest(fmt.Sprintf("the API version in the data (%s) does not match the expected API version (%s)", gvk.GroupVersion(), defaultGVK.GroupVersion()))
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Conversion done") trace.Step("Conversion done")
if err := checkName(obj, name, namespace, scope.Namer); err != nil { if err := checkName(obj, name, namespace, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -667,7 +667,7 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
err = admit.Admit(admission.NewAttributesRecord(obj, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Update, userInfo)) err = admit.Admit(admission.NewAttributesRecord(obj, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Update, userInfo))
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -680,13 +680,13 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
return obj, err return obj, err
}) })
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Object stored in database") trace.Step("Object stored in database")
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Self-link added") trace.Step("Self-link added")
@ -713,7 +713,7 @@ func DeleteResource(r rest.GracefulDeleter, checkBody bool, scope RequestScope,
namespace, name, err := scope.Namer.Name(req) namespace, name, err := scope.Namer.Name(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
ctx := scope.ContextFunc(req) ctx := scope.ContextFunc(req)
@ -723,23 +723,23 @@ func DeleteResource(r rest.GracefulDeleter, checkBody bool, scope RequestScope,
if checkBody { if checkBody {
body, err := readBody(req.Request) body, err := readBody(req.Request)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if len(body) > 0 { if len(body) > 0 {
s, err := negotiateInputSerializer(req.Request, scope.Serializer) s, err := negotiateInputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
defaultGVK := scope.Kind.GroupVersion().WithKind("DeleteOptions") defaultGVK := scope.Kind.GroupVersion().WithKind("DeleteOptions")
obj, _, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, options) obj, _, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, options)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if obj != options { if obj != options {
scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), req, res) scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), res.ResponseWriter, req.Request)
return return
} }
} }
@ -750,7 +750,7 @@ func DeleteResource(r rest.GracefulDeleter, checkBody bool, scope RequestScope,
err = admit.Admit(admission.NewAttributesRecord(nil, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Delete, userInfo)) err = admit.Admit(admission.NewAttributesRecord(nil, scope.Kind.GroupKind(), namespace, name, scope.Resource.GroupResource(), scope.Subresource, admission.Delete, userInfo))
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -760,7 +760,7 @@ func DeleteResource(r rest.GracefulDeleter, checkBody bool, scope RequestScope,
return r.Delete(ctx, name, options) return r.Delete(ctx, name, options)
}) })
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
trace.Step("Object deleted from database") trace.Step("Object deleted from database")
@ -780,7 +780,7 @@ func DeleteResource(r rest.GracefulDeleter, checkBody bool, scope RequestScope,
// when a non-status response is returned, set the self link // when a non-status response is returned, set the self link
if _, ok := result.(*unversioned.Status); !ok { if _, ok := result.(*unversioned.Status); !ok {
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -799,7 +799,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
namespace, err := scope.Namer.Namespace(req) namespace, err := scope.Namer.Namespace(req)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -811,14 +811,14 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
err = admit.Admit(admission.NewAttributesRecord(nil, scope.Kind.GroupKind(), namespace, "", scope.Resource.GroupResource(), scope.Subresource, admission.Delete, userInfo)) err = admit.Admit(admission.NewAttributesRecord(nil, scope.Kind.GroupKind(), namespace, "", scope.Resource.GroupResource(), scope.Subresource, admission.Delete, userInfo))
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
listOptions := api.ListOptions{} listOptions := api.ListOptions{}
if err := scope.ParameterCodec.DecodeParameters(req.Request.URL.Query(), scope.Kind.GroupVersion(), &listOptions); err != nil { if err := scope.ParameterCodec.DecodeParameters(req.Request.URL.Query(), scope.Kind.GroupVersion(), &listOptions); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -831,7 +831,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
if listOptions.FieldSelector, err = listOptions.FieldSelector.Transform(fn); err != nil { if listOptions.FieldSelector, err = listOptions.FieldSelector.Transform(fn); err != nil {
// TODO: allow bad request to set field causes based on query parameters // TODO: allow bad request to set field causes based on query parameters
err = errors.NewBadRequest(err.Error()) err = errors.NewBadRequest(err.Error())
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }
@ -840,23 +840,23 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
if checkBody { if checkBody {
body, err := readBody(req.Request) body, err := readBody(req.Request)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if len(body) > 0 { if len(body) > 0 {
s, err := negotiateInputSerializer(req.Request, scope.Serializer) s, err := negotiateInputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
defaultGVK := scope.Kind.GroupVersion().WithKind("DeleteOptions") defaultGVK := scope.Kind.GroupVersion().WithKind("DeleteOptions")
obj, _, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, options) obj, _, err := scope.Serializer.DecoderToVersion(s, defaultGVK.GroupVersion()).Decode(body, &defaultGVK, options)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
if obj != options { if obj != options {
scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), req, res) scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), res.ResponseWriter, req.Request)
return return
} }
} }
@ -866,7 +866,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
return r.DeleteCollection(ctx, options, &listOptions) return r.DeleteCollection(ctx, options, &listOptions)
}) })
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
@ -884,7 +884,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
// when a non-status response is returned, set the self link // when a non-status response is returned, set the self link
if _, ok := result.(*unversioned.Status); !ok { if _, ok := result.(*unversioned.Status); !ok {
if _, err := setListSelfLink(result, req, scope.Namer); err != nil { if _, err := setListSelfLink(result, req, scope.Namer); err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
} }

2
pkg/apiserver/watch.go
View File

@ -68,7 +68,7 @@ func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) {
func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) { func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) {
s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer) s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
// TODO: replace with typed serialization // TODO: replace with typed serialization