opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 21:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Update renderer plugin source (#80643)

Browse Source 
* rework renderer plugin source

* add tests
This commit is contained in:
Will Browne
2024-01-18 11:06:33 +01:00
committed by GitHub
parent 4b113f87f9
commit 3885497553
10 changed files with 233 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/services/pluginsintegration/renderer/renderer.go
View File

@ -19,22 +19,16 @@ import (
"github.com/grafana/grafana/pkg/plugins/manager/registry"
"github.com/grafana/grafana/pkg/plugins/manager/signature"
"github.com/grafana/grafana/pkg/plugins/manager/sources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/rendering"
)
func ProvideService(cfg *config.Cfg, registry registry.Service, licensing plugins.Licensing,
features featuremgmt.FeatureToggles) (*Manager, error) {
l, err := createLoader(cfg, registry, licensing, features)
func ProvideService(cfg *config.Cfg, registry registry.Service, licensing plugins.Licensing) (*Manager, error) {
l, err := createLoader(cfg, registry, licensing)
if err != nil {
return nil, err
}
return &Manager{
cfg: cfg,
loader: l,
log: log.New("plugins.renderer"),
}, nil
return NewManager(cfg, l), nil
}
type Manager struct {
@ -45,6 +39,14 @@ type Manager struct {
renderer *Plugin
}
func NewManager(cfg *config.Cfg, loader loader.Service) *Manager {
return &Manager{
cfg: cfg,
loader: loader,
log: log.New("renderer.manager"),
}
}
type Plugin struct {
plugin *plugins.Plugin
@ -77,22 +79,29 @@ func (m *Manager) Renderer(ctx context.Context) (rendering.Plugin, bool) {
return m.renderer, true
}
ps, err := m.loader.Load(ctx, sources.NewLocalSource(plugins.ClassExternal, []string{m.cfg.PluginsPath}))
srcs, err := sources.DirAsLocalSources(m.cfg.PluginsPath, plugins.ClassExternal)
if err != nil {
m.log.Error("Failed to load renderer plugin", "error", err)
m.log.Error("Failed to get renderer plugin sources", "error", err)
return nil, false
}
if len(ps) >= 1 {
m.renderer = &Plugin{plugin: ps[0]}
return m.renderer, true
for _, src := range srcs {
ps, err := m.loader.Load(ctx, src)
if err != nil {
m.log.Error("Failed to load renderer plugin", "error", err)
return nil, false
}
if len(ps) >= 1 {
m.renderer = &Plugin{plugin: ps[0]}
return m.renderer, true
}
}
return nil, false
}
func createLoader(cfg *config.Cfg, pr registry.Service, l plugins.Licensing,
features featuremgmt.FeatureToggles) (loader.Service, error) {
func createLoader(cfg *config.Cfg, pr registry.Service, l plugins.Licensing) (loader.Service, error) {
d := discovery.New(cfg, discovery.Opts{
FindFilterFuncs: []discovery.FindFilterFunc{
discovery.NewPermittedPluginTypesFilterStep([]plugins.Type{plugins.TypeRenderer}),