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

Plugins: Forbid loading Angular plugins when Angular is disabled (#69679)

Browse Source 
* Plugins: Forbid loading Angular plugins when Angular is disabled

* Plugins: Made angulardetector a service, add tests for angular loader cases

* Fix missing import

* Add nolint:gocyclo to loadPlugins
This commit is contained in:
Giuseppe Guerra
2023-06-07 11:08:01 +02:00
committed by GitHub
parent f7dd7c5ad8
commit f148b5fb28
11 changed files with 217 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/pluginsintegration/pluginsintegration.go
View File

@ -12,6 +12,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/manager/client"
"github.com/grafana/grafana/pkg/plugins/manager/filestore"
"github.com/grafana/grafana/pkg/plugins/manager/loader"
"github.com/grafana/grafana/pkg/plugins/manager/loader/angulardetector"
"github.com/grafana/grafana/pkg/plugins/manager/loader/assetpath"
"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
"github.com/grafana/grafana/pkg/plugins/manager/process"
@ -51,6 +52,7 @@ var WireSet = wire.NewSet(
coreplugin.ProvideCoreRegistry,
pluginscdn.ProvideService,
assetpath.ProvideService,
angulardetector.ProvideService,
loader.ProvideService,
wire.Bind(new(loader.Service), new(*loader.Loader)),
wire.Bind(new(plugins.ErrorResolver), new(*loader.Loader)),