Plugins API: Merge meta and installs (#112962)

pkg/registry/apps/plugins/register.go

@@ -1,20 +1,15 @@
 package plugins
 
 import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/registry/generic"
-	"k8s.io/apiserver/pkg/registry/rest"
 	restclient "k8s.io/client-go/rest"
 
 	"github.com/grafana/grafana-app-sdk/app"
 	appsdkapiserver "github.com/grafana/grafana-app-sdk/k8s/apiserver"
 	"github.com/grafana/grafana-app-sdk/simple"
 	pluginsappapis "github.com/grafana/grafana/apps/plugins/pkg/apis"
-	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
 	pluginsapp "github.com/grafana/grafana/apps/plugins/pkg/app"
 	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
-	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -26,16 +21,13 @@ var (
 
 type PluginsAppInstaller struct {
 	appsdkapiserver.AppInstaller
-	cfg *setting.Cfg
 }
 
 func RegisterAppInstaller(
 	cfg *setting.Cfg,
 	features featuremgmt.FeatureToggles,
 ) (*PluginsAppInstaller, error) {
-	installer := &PluginsAppInstaller{
-		cfg: cfg,
-	}
+	installer := &PluginsAppInstaller{}
 	specificConfig := any(nil)
 	provider := simple.NewAppProvider(pluginsappapis.LocalManifest(), specificConfig, pluginsapp.New)
 	appConfig := app.Config{
@@ -51,21 +43,6 @@ func RegisterAppInstaller(
 	return installer, nil
 }
 
-func (p *PluginsAppInstaller) InstallAPIs(
-	server appsdkapiserver.GenericAPIServer,
-	restOptsGetter generic.RESTOptionsGetter,
-) error {
-	pluginMetaGVR := pluginsv0alpha1.PluginMetaKind().GroupVersionResource()
-	replacedStorage := map[schema.GroupVersionResource]rest.Storage{
-		pluginMetaGVR: pluginsapp.NewPluginMetaStorage(request.GetNamespaceMapper(p.cfg)),
-	}
-	wrappedServer := &customStorageWrapper{
-		wrapped: server,
-		replace: replacedStorage,
-	}
-	return p.AppInstaller.InstallAPIs(wrappedServer, restOptsGetter)
-}
-
 // GetAuthorizer returns the authorizer for the plugins app.
 func (p *PluginsAppInstaller) GetAuthorizer() authorizer.Authorizer {
 	return pluginsapp.GetAuthorizer()