Simplify open feature setup (#107632)
* Simplify open feature setup * Fix linter issues * Apply review feedback * Fix integration tests setup
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"strconv"
|
||||
"sync"
|
||||
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"golang.org/x/sync/errgroup"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
@@ -131,6 +132,11 @@ func (s *Server) Init() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// Initialize the OpenFeature feature flag system
|
||||
if err := featuremgmt.InitOpenFeatureWithCfg(s.cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return s.provisioningService.RunInitProvisioners(s.context)
|
||||
}
|
||||
|
||||
|
||||
@@ -326,8 +326,6 @@ var wireBasicSet = wire.NewSet(
|
||||
expr.ProvideService,
|
||||
featuremgmt.ProvideManagerService,
|
||||
featuremgmt.ProvideToggles,
|
||||
featuremgmt.ProvideOpenFeatureService,
|
||||
featuremgmt.ProvideStaticEvaluator,
|
||||
dashboardservice.ProvideDashboardServiceImpl,
|
||||
wire.Bind(new(dashboards.PermissionsRegistrationService), new(*dashboardservice.DashboardServiceImpl)),
|
||||
dashboardservice.ProvideDashboardService,
|
||||
|
||||
+5
-15
File diff suppressed because one or more lines are too long
@@ -156,7 +156,6 @@ var wireExtsBaseCLISet = wire.NewSet(
|
||||
metrics.WireSet,
|
||||
featuremgmt.ProvideManagerService,
|
||||
featuremgmt.ProvideToggles,
|
||||
featuremgmt.ProvideOpenFeatureService,
|
||||
hooks.ProvideService,
|
||||
setting.ProvideProvider, wire.Bind(new(setting.Provider), new(*setting.OSSImpl)),
|
||||
licensing.ProvideService, wire.Bind(new(licensing.Licensing), new(*licensing.OSSLicensingService)),
|
||||
|
||||
Reference in New Issue
Block a user