public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* Chore: unite wire graphs for cli and server

* remove cli wire once again

* try to fix runner wire injection

* unify runner initialisation
This commit is contained in:
Serge Zaitsev
2023-03-17 16:36:39 +01:00
committed by GitHub
parent f5cb8c660e
commit 2d30f33ad8
9 changed files with 84 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-cli/commands/commands.go
+13 -24
View File
@@ -10,33 +10,25 @@ import (
"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/datamigrations"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/secretsmigrations"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/server"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
"github.com/grafana/grafana/pkg/setting"
)
func runRunnerCommand(command func(commandLine utils.CommandLine, runner runner.Runner) error) func(context *cli.Context) error {
func runRunnerCommand(command func(commandLine utils.CommandLine, runner server.Runner) error) func(context *cli.Context) error {
return func(context *cli.Context) error {
cmd := &utils.ContextCommandLine{Context: context}
cfg, err := initCfg(cmd)
if err != nil {
return fmt.Errorf("%v: %w", "failed to load configuration", err)
}
r, err := runner.Initialize(cfg)
runner, err := initializeRunner(cmd)
if err != nil {
return fmt.Errorf("%v: %w", "failed to initialize runner", err)
}
if err := command(cmd, r); err != nil {
if err := command(cmd, runner); err != nil {
return err
}
logger.Info("\n\n")
return nil
}
@@ -45,20 +37,19 @@ func runRunnerCommand(command func(commandLine utils.CommandLine, runner runner.
func runDbCommand(command func(commandLine utils.CommandLine, sqlStore db.DB) error) func(context *cli.Context) error {
return func(context *cli.Context) error {
cmd := &utils.ContextCommandLine{Context: context}
cfg, err := initCfg(cmd)
runner, err := initializeRunner(cmd)
if err != nil {
return fmt.Errorf("%v: %w", "failed to load configuration", err)
return fmt.Errorf("%v: %w", "failed to initialize runner", err)
}
tracer, err := tracing.ProvideService(cfg)
tracer, err := tracing.ProvideService(runner.Cfg)
if err != nil {
return fmt.Errorf("%v: %w", "failed to initialize tracer service", err)
}
bus := bus.ProvideBus(tracer)
sqlStore, err := db.ProvideService(cfg, nil, &migrations.OSSMigrations{}, bus, tracer)
sqlStore, err := db.ProvideService(runner.Cfg, nil, &migrations.OSSMigrations{}, bus, tracer)
if err != nil {
return fmt.Errorf("%v: %w", "failed to initialize SQL store", err)
}
@@ -72,24 +63,22 @@ func runDbCommand(command func(commandLine utils.CommandLine, sqlStore db.DB) er
}
}
func initCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, error) {
func initializeRunner(cmd *utils.ContextCommandLine) (server.Runner, error) {
configOptions := strings.Split(cmd.String("configOverrides"), " ")
cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
runner, err := server.InitializeForCLI(setting.CommandLineArgs{
Config: cmd.ConfigFile(),
HomePath: cmd.HomePath(),
// tailing arguments have precedence over the options string
Args: append(configOptions, cmd.Args().Slice()...),
})
if err != nil {
return nil, err
return server.Runner{}, fmt.Errorf("%v: %w", "failed to initialize runner", err)
}
if cmd.Bool("debug") {
cfg.LogConfigSources()
runner.Cfg.LogConfigSources()
}
return cfg, nil
return runner, nil
}
func runPluginCommand(command func(commandLine utils.CommandLine) error) func(context *cli.Context) error {
pkg/cmd/grafana-cli/commands/reset_password_command.go
+2 -2
View File
@@ -9,15 +9,15 @@ import (
"github.com/fatih/color"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
"github.com/grafana/grafana/pkg/server"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/util"
)
const DefaultAdminUserId = 1
func resetPasswordCommand(c utils.CommandLine, runner runner.Runner) error {
func resetPasswordCommand(c utils.CommandLine, runner server.Runner) error {
newPassword := ""
adminId := int64(c.Int("user-id"))
pkg/cmd/grafana-cli/commands/secretsmigrations/secretsmigrations.go
+4 -4
View File
@@ -3,20 +3,20 @@ package secretsmigrations
import (
"context"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
"github.com/grafana/grafana/pkg/server"
)
func ReEncryptDEKS(_ utils.CommandLine, runner runner.Runner) error {
func ReEncryptDEKS(_ utils.CommandLine, runner server.Runner) error {
return runner.SecretsService.ReEncryptDataKeys(context.Background())
}
func ReEncryptSecrets(_ utils.CommandLine, runner runner.Runner) error {
func ReEncryptSecrets(_ utils.CommandLine, runner server.Runner) error {
_, err := runner.SecretsMigrator.ReEncryptSecrets(context.Background())
return err
}
func RollBackSecrets(_ utils.CommandLine, runner runner.Runner) error {
func RollBackSecrets(_ utils.CommandLine, runner server.Runner) error {
_, err := runner.SecretsMigrator.RollBackSecrets(context.Background())
return err
}