Merge pull request #62 from yue9944882/feat/storage-provider

Resend: Feat - Plumb parent storage for arbitrary subresource

pkg/builder/builder_resource.go

@@ -192,7 +192,7 @@ func (a *Server) withSubResourceIfExists(obj resource.Object, parentStorageProvi
 		for _, sub := range sgs.GetArbitrarySubResources() {
 			sub := sub
 			subResourceGVR := parentGVR.GroupVersion().WithResource(parentGVR.Resource + "/" + sub.SubResourceName())
-			a.forGroupVersionSubResource(subResourceGVR, parentStorageProvider, rest.StaticHandlerProvider{Storage: sub}.Get)
+			a.forGroupVersionSubResource(subResourceGVR, parentStorageProvider, rest.ParentStaticHandlerProvider{Storage: sub}.Get)
 		}
 	}
 }

pkg/builder/rest/provider.go

@@ -17,10 +17,14 @@ limitations under the License.
 package rest
 
 import (
+	"context"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/rest"
 	"sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/apiserver"
+	contextutil "sigs.k8s.io/apiserver-runtime/pkg/util/context"
 )
 
 // ResourceHandlerProvider provides a request handler for a resource
@@ -35,3 +39,31 @@ type StaticHandlerProvider struct { // TODO: privatize
 func (p StaticHandlerProvider) Get(s *runtime.Scheme, g generic.RESTOptionsGetter) (rest.Storage, error) {
 	return p.Storage, nil
 }
+
+// ParentStaticHandlerProvider returns itself as the request handler, but with the parent
+// storage plumbed in the context.
+type ParentStaticHandlerProvider struct {
+	rest.Storage
+}
+
+// Get returns itself as the handler
+func (p ParentStaticHandlerProvider) Get(s *runtime.Scheme, g generic.RESTOptionsGetter) (rest.Storage, error) {
+	if getter, isGetter := p.Storage.(rest.Getter); isGetter {
+		return parentPlumbedStorageProvider{delegate: getter}, nil
+	}
+	return p.Storage, nil
+}
+
+var _ rest.Getter = &parentPlumbedStorageProvider{}
+
+type parentPlumbedStorageProvider struct {
+	delegate rest.Getter
+}
+
+func (p parentPlumbedStorageProvider) New() runtime.Object {
+	return p.delegate.(rest.Storage).New()
+}
+
+func (p parentPlumbedStorageProvider) Get(ctx context.Context, name string, options *v1.GetOptions) (runtime.Object, error) {
+	return p.delegate.Get(contextutil.WithParentStorage(ctx, p.delegate.(rest.Storage)), name, options)
+}