Chore: Unite wire graphs for cli and server (#61143)

* Chore: unite wire graphs for cli and server

* remove cli wire once again

* try to fix runner wire injection

* unify runner initialisation

pkg/server/runner.go

@@ -0,0 +1,39 @@
+package server
+
+import (
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/encryption"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type Runner struct {
+	Cfg               *setting.Cfg
+	SQLStore          db.DB
+	SettingsProvider  setting.Provider
+	Features          featuremgmt.FeatureToggles
+	EncryptionService encryption.Internal
+	SecretsService    *manager.SecretsService
+	SecretsMigrator   secrets.Migrator
+	UserService       user.Service
+}
+
+func NewRunner(cfg *setting.Cfg, sqlStore db.DB, settingsProvider setting.Provider,
+	encryptionService encryption.Internal, features featuremgmt.FeatureToggles,
+	secretsService *manager.SecretsService, secretsMigrator secrets.Migrator,
+	userService user.Service,
+) Runner {
+	return Runner{
+		Cfg:               cfg,
+		SQLStore:          sqlStore,
+		SettingsProvider:  settingsProvider,
+		EncryptionService: encryptionService,
+		SecretsService:    secretsService,
+		SecretsMigrator:   secretsMigrator,
+		Features:          features,
+		UserService:       userService,
+	}
+}

pkg/server/wire.go

@@ -168,7 +168,6 @@ var wireBasicSet = wire.NewSet(
 	alerting.ProvideAlertStore,
 	alerting.ProvideAlertEngine,
 	wire.Bind(new(alerting.UsageStatsQuerier), new(*alerting.AlertEngine)),
-	setting.NewCfgFromArgs,
 	New,
 	api.ProvideHTTPServer,
 	query.ProvideService,
@@ -338,6 +337,7 @@ var wireBasicSet = wire.NewSet(
 	grpcserver.ProvideHealthService,
 	grpcserver.ProvideReflectionService,
 	interceptors.ProvideAuthenticator,
+	setting.NewCfgFromArgs,
 	kind.ProvideService, // The registry of known kinds
 	sqlstash.ProvideSQLEntityServer,
 	resolver.ProvideEntityReferenceResolver,
@@ -376,6 +376,20 @@ var wireSet = wire.NewSet(
 	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
 )
 
+var wireCLISet = wire.NewSet(
+	NewRunner,
+	wireBasicSet,
+	sqlstore.ProvideService,
+	ngmetrics.ProvideService,
+	wire.Bind(new(notifications.Service), new(*notifications.NotificationService)),
+	wire.Bind(new(notifications.WebhookSender), new(*notifications.NotificationService)),
+	wire.Bind(new(notifications.EmailSender), new(*notifications.NotificationService)),
+	wire.Bind(new(db.DB), new(*sqlstore.SQLStore)),
+	prefimpl.ProvideService,
+	oauthtoken.ProvideService,
+	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
+)
+
 var wireTestSet = wire.NewSet(
 	wireBasicSet,
 	ProvideTestEnv,
@@ -402,3 +416,8 @@ func InitializeForTest(cla setting.CommandLineArgs, opts Options, apiOpts api.Se
 	wire.Build(wireExtsTestSet)
 	return &TestEnv{Server: &Server{}, SQLStore: &sqlstore.SQLStore{}}, nil
 }
+
+func InitializeForCLI(cla setting.CommandLineArgs) (Runner, error) {
+	wire.Build(wireExtsCLISet)
+	return Runner{}, nil
+}

pkg/server/wireexts_oss.go

@@ -95,6 +95,11 @@ var wireExtsSet = wire.NewSet(
 	wireExtsBasicSet,
 )
 
+var wireExtsCLISet = wire.NewSet(
+	wireCLISet,
+	wireExtsBasicSet,
+)
+
 var wireExtsTestSet = wire.NewSet(
 	wireTestSet,
 	wireExtsBasicSet,