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

[WIP] Plugins: Introduce Plugins specific config (#54854)

Browse Source
This commit is contained in:
Will Browne
2022-09-14 14:35:35 +01:00
committed by GitHub
parent 8b38f9408d
commit 0571d98bba
14 changed files with 243 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/loader/initializer/initializer.go
+4 -3
View File
@@ -12,16 +12,17 @@ import (
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/config"
)
type Initializer struct {
cfg *plugins.Cfg
cfg *config.Cfg
license models.Licensing
backendProvider plugins.BackendFactoryProvider
log log.Logger
}
func New(cfg *plugins.Cfg, backendProvider plugins.BackendFactoryProvider, license models.Licensing) Initializer {
func New(cfg *config.Cfg, backendProvider plugins.BackendFactoryProvider, license models.Licensing) Initializer {
return Initializer{
cfg: cfg,
license: license,
@@ -101,7 +102,7 @@ func (ps pluginSettings) asEnvVar(prefix string, hostEnv []string) []string {
return env
}
func getPluginSettings(pluginID string, cfg *plugins.Cfg) pluginSettings {
func getPluginSettings(pluginID string, cfg *config.Cfg) pluginSettings {
ps := pluginSettings{}
for k, v := range cfg.PluginSettings[pluginID] {
if k == "path" || strings.ToLower(k) == "id" {
pkg/plugins/manager/loader/initializer/initializer_test.go
+6 -5
View File
@@ -10,6 +10,7 @@ import (
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/backendplugin"
"github.com/grafana/grafana/pkg/plugins/config"
)
func TestInitializer_Initialize(t *testing.T) {
@@ -34,7 +35,7 @@ func TestInitializer_Initialize(t *testing.T) {
}
i := &Initializer{
cfg: plugins.NewCfg(),
cfg: &config.Cfg{},
log: log.NewNopLogger(),
backendProvider: &fakeBackendProvider{
plugin: p,
@@ -64,7 +65,7 @@ func TestInitializer_Initialize(t *testing.T) {
}
i := &Initializer{
cfg: plugins.NewCfg(),
cfg: &config.Cfg{},
log: log.NewNopLogger(),
backendProvider: &fakeBackendProvider{
plugin: p,
@@ -94,7 +95,7 @@ func TestInitializer_Initialize(t *testing.T) {
}
i := &Initializer{
cfg: plugins.NewCfg(),
cfg: &config.Cfg{},
log: log.NewNopLogger(),
backendProvider: &fakeBackendProvider{
plugin: p,
@@ -117,7 +118,7 @@ func TestInitializer_Initialize(t *testing.T) {
}
i := &Initializer{
cfg: &plugins.Cfg{},
cfg: &config.Cfg{},
log: log.NewNopLogger(),
backendProvider: &fakeBackendProvider{
plugin: p,
@@ -147,7 +148,7 @@ func TestInitializer_envVars(t *testing.T) {
}
i := &Initializer{
cfg: &plugins.Cfg{
cfg: &config.Cfg{
EnterpriseLicensePath: "/path/to/ent/license",
PluginSettings: map[string]map[string]string{
"test": {