Chore: Removes HideAngularDeprecation configuration (#110665)
* Chore: cleans up HideAngularDeprecation * Trigger build
This commit is contained in:
@@ -24,8 +24,6 @@ type PluginManagementCfg struct {
|
||||
GrafanaAppURL string
|
||||
|
||||
Features Features
|
||||
|
||||
HideAngularDeprecation []string
|
||||
}
|
||||
|
||||
// Features contains the feature toggles used for the plugin management system.
|
||||
@@ -42,20 +40,19 @@ type Features struct {
|
||||
// NewPluginManagementCfg returns a new PluginManagementCfg.
|
||||
func NewPluginManagementCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
|
||||
pluginsCDNURLTemplate string, appURL string, features Features,
|
||||
grafanaComAPIURL string, disablePlugins []string, hideAngularDeprecation []string, forwardHostEnvVars []string, grafanaComAPIToken string,
|
||||
grafanaComAPIURL string, disablePlugins []string, forwardHostEnvVars []string, grafanaComAPIToken string,
|
||||
) *PluginManagementCfg {
|
||||
return &PluginManagementCfg{
|
||||
PluginsPath: pluginsPath,
|
||||
DevMode: devMode,
|
||||
PluginSettings: pluginSettings,
|
||||
PluginsAllowUnsigned: pluginsAllowUnsigned,
|
||||
DisablePlugins: disablePlugins,
|
||||
PluginsCDNURLTemplate: pluginsCDNURLTemplate,
|
||||
GrafanaComAPIURL: grafanaComAPIURL,
|
||||
GrafanaAppURL: appURL,
|
||||
Features: features,
|
||||
HideAngularDeprecation: hideAngularDeprecation,
|
||||
ForwardHostEnvVars: forwardHostEnvVars,
|
||||
GrafanaComAPIToken: grafanaComAPIToken,
|
||||
PluginsPath: pluginsPath,
|
||||
DevMode: devMode,
|
||||
PluginSettings: pluginSettings,
|
||||
PluginsAllowUnsigned: pluginsAllowUnsigned,
|
||||
DisablePlugins: disablePlugins,
|
||||
PluginsCDNURLTemplate: pluginsCDNURLTemplate,
|
||||
GrafanaComAPIURL: grafanaComAPIURL,
|
||||
GrafanaAppURL: appURL,
|
||||
Features: features,
|
||||
ForwardHostEnvVars: forwardHostEnvVars,
|
||||
GrafanaComAPIToken: grafanaComAPIToken,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package validation
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/grafana/grafana/pkg/plugins"
|
||||
@@ -117,6 +116,5 @@ func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error
|
||||
}).WithMessage("angular plugins are not supported")
|
||||
}
|
||||
}
|
||||
p.Angular.HideDeprecation = slices.Contains(a.cfg.HideAngularDeprecation, p.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -79,8 +79,7 @@ var (
|
||||
)
|
||||
|
||||
type AngularMeta struct {
|
||||
Detected bool `json:"detected"`
|
||||
HideDeprecation bool `json:"hideDeprecation"`
|
||||
Detected bool `json:"detected"`
|
||||
}
|
||||
|
||||
// JSONData represents the plugin's plugin.json
|
||||
|
||||
Reference in New Issue
Block a user