IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix and add test (#44286)

Browse Source
This commit is contained in:
Will Browne
2022-01-21 11:00:20 +01:00
committed by GitHub
parent 1ae155d2b1
commit 3cb0fb3ddc
5 changed files with 269 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugins/manager/loader/loader.go
View File

@@ -135,7 +135,6 @@ func (l *Loader) loadPlugins(ctx context.Context, class plugins.Class, pluginJSO
PluginDir: pluginDir,
Class: class,
}
l.setDefaults(plugin)
plugin.SetLogger(l.log.New("pluginID", plugin.ID))
sig, err := signature.Calculate(l.log, plugin)
@@ -203,6 +202,7 @@ func (l *Loader) loadPlugins(ctx context.Context, class plugins.Class, pluginJSO
}
for _, p := range verifiedPlugins {
l.setDefaults(p)
err := l.pluginInitializer.Initialize(ctx, p)
if err != nil {
return nil, err
@@ -273,7 +273,7 @@ func (l *Loader) setDefaults(p *plugins.Plugin) {
if p.IsApp() {
for _, child := range p.Children {
setChildModule(p, child)
setPathsBasedOnApp(p, child)
}
// slugify pages
@@ -310,7 +310,7 @@ func setModule(p *plugins.Plugin) {
p.BaseURL = path.Join("public/plugins", p.ID)
}
func setChildModule(parent *plugins.Plugin, child *plugins.Plugin) {
func setPathsBasedOnApp(parent *plugins.Plugin, child *plugins.Plugin) {
appSubPath := strings.ReplaceAll(strings.Replace(child.PluginDir, parent.PluginDir, "", 1), "\\", "/")
child.IncludedInAppID = parent.ID
child.BaseURL = parent.BaseURL