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

Pass Context to GenerateLink

Browse Source
This commit is contained in:
Wojciech Tyczynski 2017-05-22 16:50:24 +02:00
parent 16b5093feb
commit 25f0fe1adb
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/namer.go
View File

@ -45,7 +45,7 @@ type ScopeNamer interface {
SetSelfLink(obj runtime.Object, url string) error SetSelfLink(obj runtime.Object, url string) error
// GenerateLink creates an encoded URI for a given runtime object that represents the canonical path // GenerateLink creates an encoded URI for a given runtime object that represents the canonical path
// and query. // and query.
GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) GenerateLink(ctx request.Context, obj runtime.Object) (uri string, err error)
// GenerateListLink creates an encoded URI for a list that represents the canonical path and query. // GenerateListLink creates an encoded URI for a list that represents the canonical path and query.
GenerateListLink(req *http.Request) (uri string, err error) GenerateListLink(req *http.Request) (uri string, err error)
} }
@ -90,8 +90,8 @@ func (n ContextBasedNaming) Name(req *http.Request) (namespace, name string, err
return ns, requestInfo.Name, nil return ns, requestInfo.Name, nil
} }
func (n ContextBasedNaming) GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) { func (n ContextBasedNaming) GenerateLink(ctx request.Context, obj runtime.Object) (uri string, err error) {
requestInfo, ok := request.RequestInfoFrom(n.GetContext(req)) requestInfo, ok := request.RequestInfoFrom(ctx)
if !ok { if !ok {
return "", fmt.Errorf("missing requestInfo") return "", fmt.Errorf("missing requestInfo")
} }

22
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
View File

@ -102,7 +102,7 @@ func getResourceHandler(scope RequestScope, getter getterFunc) http.HandlerFunc
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, ctx, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -321,7 +321,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
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, ctx, req, scope.Namer)
if err != nil { if err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
@ -419,7 +419,7 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object
} }
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, ctx, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -512,7 +512,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, admit admission.Interface
return return
} }
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, ctx, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -829,7 +829,7 @@ func UpdateResource(r rest.Updater, scope RequestScope, typer runtime.ObjectType
} }
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, ctx, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -943,7 +943,7 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco
} else { } else {
// 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.(*metav1.Status); !ok { if _, ok := result.(*metav1.Status); !ok {
if err := setSelfLink(result, req, scope.Namer); err != nil { if err := setSelfLink(result, ctx, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -1045,7 +1045,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
} else { } else {
// 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.(*metav1.Status); !ok { if _, ok := result.(*metav1.Status); !ok {
if _, err := setListSelfLink(result, req, scope.Namer); err != nil { if _, err := setListSelfLink(result, ctx, req, scope.Namer); err != nil {
scope.err(err, w, req) scope.err(err, w, req)
return return
} }
@ -1113,9 +1113,9 @@ func transformDecodeError(typer runtime.ObjectTyper, baseErr error, into runtime
// setSelfLink sets the self link of an object (or the child items in a list) to the base URL of the request // setSelfLink sets the self link of an object (or the child items in a list) to the base URL of the request
// plus the path and query generated by the provided linkFunc // plus the path and query generated by the provided linkFunc
func setSelfLink(obj runtime.Object, req *http.Request, namer ScopeNamer) error { func setSelfLink(obj runtime.Object, ctx request.Context, namer ScopeNamer) error {
// TODO: SelfLink generation should return a full URL? // TODO: SelfLink generation should return a full URL?
uri, err := namer.GenerateLink(req, obj) uri, err := namer.GenerateLink(ctx, obj)
if err != nil { if err != nil {
return nil return nil
} }
@ -1160,7 +1160,7 @@ func checkName(obj runtime.Object, name, namespace string, namer ScopeNamer) err
// setListSelfLink sets the self link of a list to the base URL, then sets the self links // setListSelfLink sets the self link of a list to the base URL, then sets the self links
// on all child objects returned. Returns the number of items in the list. // on all child objects returned. Returns the number of items in the list.
func setListSelfLink(obj runtime.Object, req *http.Request, namer ScopeNamer) (int, error) { func setListSelfLink(obj runtime.Object, ctx request.Context, req *http.Request, namer ScopeNamer) (int, error) {
if !meta.IsListType(obj) { if !meta.IsListType(obj) {
return 0, nil return 0, nil
} }
@ -1176,7 +1176,7 @@ func setListSelfLink(obj runtime.Object, req *http.Request, namer ScopeNamer) (i
count := 0 count := 0
err = meta.EachListItem(obj, func(obj runtime.Object) error { err = meta.EachListItem(obj, func(obj runtime.Object) error {
count++ count++
return setSelfLink(obj, req, namer) return setSelfLink(obj, ctx, namer)
}) })
return count, err return count, err
} }

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
View File

@ -160,11 +160,11 @@ func (p *testNamer) SetSelfLink(obj runtime.Object, url string) error {
} }
// GenerateLink creates a path and query for a given runtime object that represents the canonical path. // GenerateLink creates a path and query for a given runtime object that represents the canonical path.
func (p *testNamer) GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) { func (p *testNamer) GenerateLink(ctx request.Context, obj runtime.Object) (uri string, err error) {
return "", errors.New("not implemented") return "", errors.New("not implemented")
} }
// GenerateLink creates a path and query for a list that represents the canonical path. // GenerateListLink creates a path and query for a list that represents the canonical path.
func (p *testNamer) GenerateListLink(req *http.Request) (uri string, err error) { func (p *testNamer) GenerateListLink(req *http.Request) (uri string, err error) {
return "", errors.New("not implemented") return "", errors.New("not implemented")
} }

11
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go
View File

@ -30,6 +30,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
"k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/server/httplog"
"k8s.io/apiserver/pkg/util/wsstream" "k8s.io/apiserver/pkg/util/wsstream"
@ -88,6 +89,14 @@ func serveWatch(watcher watch.Interface, scope RequestScope, req *http.Request,
mediaType += ";stream=watch" mediaType += ";stream=watch"
} }
namespace, _, err := scope.Namer.Name(req)
if err != nil {
scope.err(fmt.Errorf("unexpected error from Namer.Name: %v", err), w, req)
return
}
ctx := scope.ContextFunc(req)
ctx = request.WithNamespace(ctx, namespace)
server := &WatchServer{ server := &WatchServer{
Watching: watcher, Watching: watcher,
Scope: scope, Scope: scope,
@ -98,7 +107,7 @@ func serveWatch(watcher watch.Interface, scope RequestScope, req *http.Request,
Encoder: encoder, Encoder: encoder,
EmbeddedEncoder: embeddedEncoder, EmbeddedEncoder: embeddedEncoder,
Fixup: func(obj runtime.Object) { Fixup: func(obj runtime.Object) {
if err := setSelfLink(obj, req, scope.Namer); err != nil { if err := setSelfLink(obj, ctx, scope.Namer); err != nil {
utilruntime.HandleError(fmt.Errorf("failed to set link for object %v: %v", reflect.TypeOf(obj), err)) utilruntime.HandleError(fmt.Errorf("failed to set link for object %v: %v", reflect.TypeOf(obj), err))
} }
}, },