mirror of
https://github.com/grafana/grafana.git
synced 2025-07-29 23:42:13 +08:00

* chore(angularsupport): delete feature toggle to disable angular * feat(angular-support): remove config.angularSupportEnabled * chore(jest): remove angular from setup file * chore(angular): delete angular deprecation ui components * refactor(angular): move migration featureflags into migration notice * chore(dashboard): remove angular deprecation notices * chore(annotations): remove angular editor loader * feat(appwrapper): no more angular app loading * feat(pluginscatalog): clean up angular plugin warnings and logic * chore(angular): delete angular app and associated files * feat(plugins): delete old angular graph plugin * feat(plugins): delete old angular table panel * feat(frontend): remove unused appEvent type * feat(dashboards): clean up angular from panel options and menu * feat(plugins): remove graph and table-old from built in plugins and delete sdk * feat(frontend): remove angular related imports in routes and explore graph * feat(theme): remove angular panel styles from global styles * chore(i18n): run make i18n-extract * test(api_plugins_test): refresh snapshot due to deleting old graph and table plugins * chore(angulardeprecation): delete angular migration notice components and usage * test(frontend): clean up tests that assert rendering angular deprecation notices * chore(backend): remove autoMigrateOldPanels feature flag * chore(config): remove angularSupportEnabled from config preventing loading angular plugins * chore(graphpanel): remove autoMigrateGraphPanel from feature toggles * chore(tablepanel): delete autoMigrateTablePanel feature flag * chore(piechart): delete autoMigratePiechartPanel feature flag * chore(worldmappanel): remove autoMigrateWorldmapPanel feature toggle * chore(statpanel): remove autoMigrateStatPanel feature flag * feat(dashboards): remove automigrate feature flags and always auto migrate angular panels * test(pluginsintegration): fix failing loader test * test(frontend): wip: fix failures and skip erroring migration tests * chore(codeowners): remove deleted angular related files and directories * test(graphite): remove angular mock from test file * test(dashboards): skip failing exporter test, remove angularSupportEnabled flags * test(dashbaord): skip another failing panel menu test * Tests: fixes pkg/services/pluginsintegration/loader/loader_test.go (#100505) * Tests: fixes pkg/services/pluginsintegration/plugins_integration_test.go * Trigger Build * chore(dashboards): remove angularComponent from getPanelMenu, update test * feat(dashboards): remove all usage of AngularComponent and getAngularLoader * chore(betterer): refresh results file * feat(plugins): remove PluginAngularBadge component and usage * feat(datasource_srv): remove usage of getLegacyAngularInjector * feat(queryeditor): delete AngularQueryComponentScope type * Chore: removes Angular from plugin_loader * Chore: remove angular from getPlugin * Chore: fix i18n * Trigger Build * Chore: remove more Angular from importPanelPlugin * Chore: remove search options warning * Chore: remove and deprecate Angular related * chore(angular): remove angular dependencies from core and runtime * chore(runtime): delete angular injector * chore(data): delete angular scope from event bus * chore(plugin-catalog): remove code pushing app plugins angular config page * chore(yarn): refresh lock file * chore(frontend): remove ng-loader from webpack configs, remove systemjs cjs plugin * chore(navigation): remove tether-drop cleanup from GrafanaRouter, delete dependency * chore(runtime): delete AngularLoader * chore(betterer): refresh results file * chore(betterer): fix out of sync results file * feat(query): fix type and import errors in QueryEditorRow * test(dashboards): delete skipped angular related tests * Tests: add back tests and fix betterer * Tests: fix broken test * Trigger build * chore(i18n): remove angular deprecation related strings * test: clean up connections and plugins catalog tests * chore(betterer): update results file --------- Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
123 lines
3.7 KiB
Go
123 lines
3.7 KiB
Go
package validation
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"slices"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/log"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/signature"
|
|
)
|
|
|
|
// DefaultValidateFuncs are the default ValidateFunc used for the Validate step of the Validation stage.
|
|
func DefaultValidateFuncs(cfg *config.PluginManagementCfg) []ValidateFunc {
|
|
return []ValidateFunc{
|
|
SignatureValidationStep(signature.NewValidator(signature.NewUnsignedAuthorizer(cfg))),
|
|
ModuleJSValidationStep(),
|
|
AngularDetectionStep(cfg, angularinspector.NewStaticInspector()),
|
|
}
|
|
}
|
|
|
|
type PluginSignatureValidator struct {
|
|
signatureValidator signature.Validator
|
|
log log.Logger
|
|
}
|
|
|
|
func SignatureValidationStep(signatureValidator signature.Validator) ValidateFunc {
|
|
return newPluginSignatureValidator(signatureValidator).Validate
|
|
}
|
|
|
|
func newPluginSignatureValidator(signatureValidator signature.Validator) *PluginSignatureValidator {
|
|
return &PluginSignatureValidator{
|
|
signatureValidator: signatureValidator,
|
|
log: log.New("plugins.validator.signature"),
|
|
}
|
|
}
|
|
|
|
func (v *PluginSignatureValidator) Validate(_ context.Context, p *plugins.Plugin) error {
|
|
return v.signatureValidator.ValidateSignature(p)
|
|
}
|
|
|
|
type ModuleJSValidator struct {
|
|
log log.Logger
|
|
}
|
|
|
|
func ModuleJSValidationStep() ValidateFunc {
|
|
return newModuleJSValidator().Validate
|
|
}
|
|
|
|
func newModuleJSValidator() *ModuleJSValidator {
|
|
return &ModuleJSValidator{
|
|
log: log.New("plugins.validator.module"),
|
|
}
|
|
}
|
|
|
|
func (v *ModuleJSValidator) Validate(_ context.Context, p *plugins.Plugin) error {
|
|
// CDN plugins are ignored because the module.js is guaranteed to exist
|
|
if p.Class == plugins.ClassCDN {
|
|
return nil
|
|
}
|
|
|
|
if !p.IsRenderer() && !p.IsCorePlugin() {
|
|
f, err := p.FS.Open("module.js")
|
|
if err != nil {
|
|
if errors.Is(err, plugins.ErrFileNotExist) {
|
|
v.log.Warn("Plugin missing module.js", "pluginId", p.ID,
|
|
"warning", "Missing module.js, If you loaded this plugin from git, make sure to compile it.")
|
|
}
|
|
} else if f != nil {
|
|
if err = f.Close(); err != nil {
|
|
v.log.Warn("Could not close module.js", "pluginId", p.ID, "error", err)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type AngularDetector struct {
|
|
cfg *config.PluginManagementCfg
|
|
angularInspector angularinspector.Inspector
|
|
log log.Logger
|
|
}
|
|
|
|
func AngularDetectionStep(cfg *config.PluginManagementCfg, angularInspector angularinspector.Inspector) ValidateFunc {
|
|
return newAngularDetector(cfg, angularInspector).Validate
|
|
}
|
|
|
|
func newAngularDetector(cfg *config.PluginManagementCfg, angularInspector angularinspector.Inspector) *AngularDetector {
|
|
return &AngularDetector{
|
|
cfg: cfg,
|
|
angularInspector: angularInspector,
|
|
log: log.New("plugins.validator.angular"),
|
|
}
|
|
}
|
|
|
|
func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error {
|
|
if p.IsExternalPlugin() {
|
|
var err error
|
|
|
|
cctx, canc := context.WithTimeout(ctx, time.Second*10)
|
|
p.Angular.Detected, err = a.angularInspector.Inspect(cctx, p)
|
|
canc()
|
|
|
|
if err != nil {
|
|
a.log.Warn("Could not inspect plugin for angular", "pluginId", p.ID, "error", err)
|
|
}
|
|
|
|
// Do not initialize plugins if they're using Angular and Angular support is disabled
|
|
if p.Angular.Detected {
|
|
a.log.Error("Refusing to initialize plugin because it's using Angular, which has been disabled", "pluginId", p.ID)
|
|
return (&plugins.Error{
|
|
PluginID: p.ID,
|
|
ErrorCode: plugins.ErrorAngular,
|
|
}).WithMessage("angular plugins are not supported")
|
|
}
|
|
}
|
|
p.Angular.HideDeprecation = slices.Contains(a.cfg.HideAngularDeprecation, p.ID)
|
|
return nil
|
|
}
|