IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Angular detection: Fix detection not being run for CDN plugins (#70960)

Browse Source
This commit is contained in:
Giuseppe Guerra 2023-07-04 11:03:10 +02:00 committed by GitHub
parent 3ab4d77008
commit 1d8628c0cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/plugins/manager/loader/loader_test.go
View File

@ -9,7 +9,6 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/plugins"
@ -17,6 +16,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/config"
"github.com/grafana/grafana/pkg/plugins/log"
"github.com/grafana/grafana/pkg/plugins/manager/fakes"
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
"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/loader/initializer"
@ -1078,6 +1078,58 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
})
}
func TestLoader_AngularClass(t *testing.T) {
for _, tc := range []struct {
name string
class plugins.Class
expAngularDetectionRun bool
}{
{
name: "core plugin should skip angular detection",
class: plugins.ClassCore,
expAngularDetectionRun: false,
},
{
name: "bundled plugin should skip angular detection",
class: plugins.ClassBundled,
expAngularDetectionRun: false,
},
{
name: "external plugin should run angular detection",
class: plugins.ClassExternal,
expAngularDetectionRun: true,
},
{
name: "other-class plugin should run angular detection",
class: "CDN", // (enterprise-only class)
expAngularDetectionRun: true,
},
} {
t.Run(tc.name, func(t *testing.T) {
fakePluginSource := &fakes.FakePluginSource{
PluginClassFunc: func(ctx context.Context) plugins.Class {
return tc.class
},
PluginURIsFunc: func(ctx context.Context) []string {
return []string{"../testdata/valid-v2-signature"}
},
}
l := newLoader(t, &config.Cfg{AngularSupportEnabled: true}, func(l *Loader) {
// So if angularDetected = true, it means that the detection has run
l.angularInspector = angularinspector.AlwaysAngularFakeInspector
})
p, err := l.Load(context.Background(), fakePluginSource)
require.NoError(t, err)
require.Len(t, p, 1, "should load 1 plugin")
if tc.expAngularDetectionRun {
require.True(t, p[0].AngularDetected, "angular detection should run")
} else {
require.False(t, p[0].AngularDetected, "angular detection should not run")
}
})
}
}
func TestLoader_Load_Angular(t *testing.T) {
fakePluginSource := &fakes.FakePluginSource{
PluginClassFunc: func(ctx context.Context) plugins.Class {

2
pkg/plugins/plugins.go
View File

@ -486,7 +486,7 @@ func (p *Plugin) IsBundledPlugin() bool {
}
func (p *Plugin) IsExternalPlugin() bool {
return p.Class == ClassExternal
return !p.IsCorePlugin() && !p.IsBundledPlugin()
}
type Class string