Advisor: Remove legacy app register (#113773)

pkg/registry/apps/advisor/appinstaller.go

@@ -1,45 +0,0 @@
-package advisor
-
-import (
-	"github.com/grafana/grafana-app-sdk/app"
-	appsdkapiserver "github.com/grafana/grafana-app-sdk/k8s/apiserver"
-	"github.com/grafana/grafana-app-sdk/simple"
-	advisorapi "github.com/grafana/grafana/apps/advisor/pkg/apis"
-	advisorapp "github.com/grafana/grafana/apps/advisor/pkg/app"
-	"github.com/grafana/grafana/apps/advisor/pkg/app/checkregistry"
-	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/client-go/rest"
-)
-
-var (
-	_ appsdkapiserver.AppInstaller    = (*AdvisorAppInstaller)(nil)
-	_ appinstaller.AuthorizerProvider = (*AdvisorAppInstaller)(nil)
-)
-
-type AdvisorAppInstaller struct {
-	appsdkapiserver.AppInstaller
-}
-
-// GetAuthorizer returns the authorizer for the plugins app.
-func (a *AdvisorAppInstaller) GetAuthorizer() authorizer.Authorizer {
-	return advisorapp.GetAuthorizer()
-}
-
-func ProvideAppInstaller() (*AdvisorAppInstaller, error) {
-	provider := simple.NewAppProvider(advisorapi.LocalManifest(), nil, advisorapp.New)
-	specificConfig := checkregistry.AdvisorAppConfig{}
-	appConfig := app.Config{
-		KubeConfig:     rest.Config{},
-		ManifestData:   *advisorapi.LocalManifest().ManifestData,
-		SpecificConfig: specificConfig,
-	}
-
-	installer := &AdvisorAppInstaller{}
-	i, err := appsdkapiserver.NewDefaultAppInstaller(provider, appConfig, advisorapi.NewGoTypeAssociator())
-	if err != nil {
-		return nil, err
-	}
-	installer.AppInstaller = i
-	return installer, nil
-}

pkg/registry/apps/advisor/register.go

@@ -2,27 +2,38 @@ package advisor
 
 import (
 	"github.com/grafana/grafana-app-sdk/app"
+	appsdkapiserver "github.com/grafana/grafana-app-sdk/k8s/apiserver"
 	"github.com/grafana/grafana-app-sdk/simple"
-	"github.com/grafana/grafana/apps/advisor/pkg/apis"
-	advisorv0alpha1 "github.com/grafana/grafana/apps/advisor/pkg/apis/advisor/v0alpha1"
+	advisorapi "github.com/grafana/grafana/apps/advisor/pkg/apis"
 	advisorapp "github.com/grafana/grafana/apps/advisor/pkg/app"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checkregistry"
-	"github.com/grafana/grafana/pkg/services/apiserver/builder"
-	"github.com/grafana/grafana/pkg/services/apiserver/builder/runner"
+	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/client-go/rest"
 )
 
-type AdvisorAppProvider struct {
-	app.Provider
+var (
+	_ appsdkapiserver.AppInstaller    = (*AdvisorAppInstaller)(nil)
+	_ appinstaller.AuthorizerProvider = (*AdvisorAppInstaller)(nil)
+)
+
+type AdvisorAppInstaller struct {
+	appsdkapiserver.AppInstaller
 }
 
-func RegisterApp(
+// GetAuthorizer returns the authorizer for the plugins app.
+func (a *AdvisorAppInstaller) GetAuthorizer() authorizer.Authorizer {
+	return advisorapp.GetAuthorizer()
+}
+
+func ProvideAppInstaller(
 	checkRegistry checkregistry.CheckService,
 	cfg *setting.Cfg,
 	orgService org.Service,
-) *AdvisorAppProvider {
-	provider := &AdvisorAppProvider{}
+) (*AdvisorAppInstaller, error) {
+	provider := simple.NewAppProvider(advisorapi.LocalManifest(), nil, advisorapp.New)
 	pluginConfig := cfg.PluginSettings["grafana-advisor-app"]
 	specificConfig := checkregistry.AdvisorAppConfig{
 		CheckRegistry: checkRegistry,
@@ -30,13 +41,16 @@ func RegisterApp(
 		StackID:       cfg.StackID,
 		OrgService:    orgService,
 	}
-	appCfg := &runner.AppBuilderConfig{
-		OpenAPIDefGetter:         advisorv0alpha1.GetOpenAPIDefinitions,
-		ManagedKinds:             advisorapp.GetKinds(),
-		Authorizer:               advisorapp.GetAuthorizer(),
-		CustomConfig:             any(specificConfig),
-		AllowedV0Alpha1Resources: []string{builder.AllResourcesAllowed},
+	appCfg := app.Config{
+		KubeConfig:     rest.Config{},
+		ManifestData:   *advisorapi.LocalManifest().ManifestData,
+		SpecificConfig: specificConfig,
 	}
-	provider.Provider = simple.NewAppProvider(apis.LocalManifest(), appCfg, advisorapp.New)
-	return provider
+	installer := &AdvisorAppInstaller{}
+	i, err := appsdkapiserver.NewDefaultAppInstaller(provider, appCfg, advisorapi.NewGoTypeAssociator())
+	if err != nil {
+		return nil, err
+	}
+	installer.AppInstaller = i
+	return installer, nil
 }

pkg/registry/apps/apps.go

@@ -2,7 +2,6 @@ package appregistry
 
 import (
 	"context"
-	"slices"
 
 	"k8s.io/client-go/rest"
 
@@ -73,7 +72,7 @@ func ProvideAppInstallers(
 		installers = append(installers, annotationAppInstaller)
 	}
 	//nolint:staticcheck // not yet migrated to OpenFeature
-	if features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisor) && features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisorAppInstaller) {
+	if features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisor) {
 		installers = append(installers, advisorAppInstaller)
 	}
 
@@ -96,7 +95,6 @@ func ProvideBuilderRunners(
 	restConfigProvider apiserver.RestConfigProvider,
 	features featuremgmt.FeatureToggles,
 	investigationAppProvider *investigations.InvestigationsAppProvider,
-	advisorAppProvider *advisor.AdvisorAppProvider,
 	grafanaCfg *setting.Cfg,
 ) (*Service, error) {
 	cfgWrapper := func(ctx context.Context) (*rest.Config, error) {
@@ -121,12 +119,6 @@ func ProvideBuilderRunners(
 		logger.Debug("Investigations backend is enabled")
 		providers = append(providers, investigationAppProvider)
 	}
-	//nolint:staticcheck // not yet migrated to OpenFeature
-	if features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisor) &&
-		!features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisorAppInstaller) &&
-		!slices.Contains(grafanaCfg.DisablePlugins, "grafana-advisor-app") {
-		providers = append(providers, advisorAppProvider)
-	}
 	apiGroupRunner, err = runner.NewAPIGroupRunner(cfg, providers...)
 
 	if err != nil {

pkg/registry/apps/wireset.go

@@ -3,7 +3,6 @@ package appregistry
 import (
 	"github.com/google/wire"
 
-	"github.com/grafana/grafana/pkg/registry/apps/advisor"
 	"github.com/grafana/grafana/pkg/registry/apps/alerting/notifications"
 	"github.com/grafana/grafana/pkg/registry/apps/alerting/rules"
 	"github.com/grafana/grafana/pkg/registry/apps/annotation"
@@ -21,7 +20,6 @@ var WireSet = wire.NewSet(
 	ProvideBuilderRunners,
 	playlist.RegisterAppInstaller,
 	investigations.RegisterApp,
-	advisor.RegisterApp,
 	plugins.RegisterAppInstaller,
 	shorturl.RegisterAppInstaller,
 	correlations.RegisterAppInstaller,