Preinstall: Replace auto update feature flag with a permanent one (#113586)

pkg/services/pluginsintegration/plugininstaller/service.go

@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/repo"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginchecker"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
@@ -45,7 +44,6 @@ type Service struct {
 	pluginInstaller plugins.Installer
 	pluginStore     pluginstore.Store
 	pluginRepo      repo.Service
-	features        featuremgmt.FeatureToggles
 	updateChecker   pluginchecker.PluginUpdateChecker
 	installComplete chan struct{} // closed when all plugins are installed (used for testing)
 }
@@ -56,7 +54,6 @@ func ProvideService(
 	pluginInstaller plugins.Installer,
 	promReg prometheus.Registerer,
 	pluginRepo repo.Service,
-	features featuremgmt.FeatureToggles,
 	updateChecker pluginchecker.PluginUpdateChecker,
 ) (*Service, error) {
 	once.Do(func() {
@@ -70,7 +67,6 @@ func ProvideService(
 		pluginInstaller: pluginInstaller,
 		pluginStore:     pluginStore,
 		pluginRepo:      pluginRepo,
-		features:        features,
 		updateChecker:   updateChecker,
 		installComplete: make(chan struct{}),
 	}
@@ -111,8 +107,8 @@ func (s *Service) installPlugins(ctx context.Context, pluginsToInstall []setting
 				continue
 			}
 			if installPlugin.Version == "" {
-				if !s.features.IsEnabled(ctx, featuremgmt.FlagPreinstallAutoUpdate) {
-					// Skip updating the plugin if the feature flag is disabled
+				if !s.cfg.PreinstallAutoUpdate {
+					// Skip updating the plugin if auto-update is disabled
 					continue
 				}
 				// The plugin is installed but it's not pinned to a specific version

pkg/services/pluginsintegration/plugininstaller/service_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/pluginfakes"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/repo"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/installsync/installsyncfakes"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/managedplugins"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginchecker"
@@ -31,7 +30,6 @@ func TestService_IsDisabled(t *testing.T) {
 		&pluginfakes.FakePluginInstaller{},
 		prometheus.NewRegistry(),
 		&pluginfakes.FakePluginRepo{},
-		featuremgmt.WithFeatures(),
 		&pluginchecker.FakePluginUpdateChecker{},
 	)
 	require.NoError(t, err)
@@ -167,6 +165,7 @@ func TestService_Run(t *testing.T) {
 				&setting.Cfg{
 					PreinstallPluginsAsync: tt.pluginsToInstall,
 					PreinstallPluginsSync:  tt.pluginsToInstallSync,
+					PreinstallAutoUpdate:   true,
 				},
 				store,
 				&pluginfakes.FakePluginInstaller{
@@ -199,7 +198,6 @@ func TestService_Run(t *testing.T) {
 						return tt.latestPlugin, nil
 					},
 				},
-				featuremgmt.WithFeatures(featuremgmt.FlagPreinstallAutoUpdate),
 				pluginchecker.ProvideService(
 					managedplugins.NewNoop(),
 					provisionedplugins.NewNoop(),