Plugins: Add hide_angular_deprecation setting (#79296)

* Add plugins.hide_angular_deprecation config ini

* Add more tests

* Remove the ability to use [plugins.*] hide_angular_deprecation
This commit is contained in:
Giuseppe Guerra
2023-12-12 11:20:21 +02:00
committed by GitHub
parent f040a8321b
commit f76b9f266e
8 changed files with 40 additions and 23 deletions
+4 -2
View File
@@ -45,13 +45,14 @@ type Cfg struct {
Features plugins.FeatureToggles
AngularSupportEnabled bool
AngularSupportEnabled bool
HideAngularDeprecation []string
}
func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, awsExternalId string, azure *azsettings.AzureSettings, secureSocksDSProxy setting.SecureSocksDSProxySettings,
grafanaVersion string, logDatasourceRequests bool, pluginsCDNURLTemplate string, appURL string, appSubURL string, tracing Tracing, features plugins.FeatureToggles, angularSupportEnabled bool,
grafanaComURL string, disablePlugins []string) *Cfg {
grafanaComURL string, disablePlugins []string, hideAngularDeprecation []string) *Cfg {
return &Cfg{
log: log.New("plugin.cfg"),
PluginsPath: pluginsPath,
@@ -73,5 +74,6 @@ func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSetti
GrafanaAppSubURL: appSubURL,
Features: features,
AngularSupportEnabled: angularSupportEnabled,
HideAngularDeprecation: hideAngularDeprecation,
}
}
@@ -3,6 +3,7 @@ package validation
import (
"context"
"errors"
"slices"
"time"
"github.com/grafana/grafana/pkg/plugins"
@@ -108,6 +109,6 @@ func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error
return errors.New("angular plugins are not supported")
}
}
p.Angular.HideDeprecation = a.cfg.PluginSettings[p.ID]["hide_angular_deprecation"] == "true"
p.Angular.HideDeprecation = slices.Contains(a.cfg.HideAngularDeprecation, p.ID)
return nil
}