From 4fae0f49d7f3dafa656b0a2244d479f0d29cddaa Mon Sep 17 00:00:00 2001 From: Will Browne Date: Mon, 30 May 2022 09:54:28 +0200 Subject: [PATCH] tidy up (#49720) --- pkg/plugins/manager/manager_test.go | 11 +---------- pkg/plugins/manager/signature/signature.go | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkg/plugins/manager/manager_test.go b/pkg/plugins/manager/manager_test.go index 9b5435fafcb..1e6421c406b 100644 --- a/pkg/plugins/manager/manager_test.go +++ b/pkg/plugins/manager/manager_test.go @@ -622,12 +622,9 @@ func (f *fakePluginInstaller) GetUpdateInfo(_ context.Context, _, _, _ string) ( } type fakeLoader struct { - mockedLoadedPlugins []*plugins.Plugin - mockedFactoryLoadedPlugin *plugins.Plugin + mockedLoadedPlugins []*plugins.Plugin loadedPaths []string - - plugins.Loader } func (l *fakeLoader) Load(_ context.Context, _ plugins.Class, paths []string, _ map[string]struct{}) ([]*plugins.Plugin, error) { @@ -636,12 +633,6 @@ func (l *fakeLoader) Load(_ context.Context, _ plugins.Class, paths []string, _ return l.mockedLoadedPlugins, nil } -func (l *fakeLoader) LoadWithFactory(_ context.Context, _ plugins.Class, path string, _ backendplugin.PluginFactoryFunc) (*plugins.Plugin, error) { - l.loadedPaths = append(l.loadedPaths, path) - - return l.mockedFactoryLoadedPlugin, nil -} - type fakePluginClient struct { pluginID string logger log.Logger diff --git a/pkg/plugins/manager/signature/signature.go b/pkg/plugins/manager/signature/signature.go index c1acd6c8c73..b0d3c6d3bbb 100644 --- a/pkg/plugins/manager/signature/signature.go +++ b/pkg/plugins/manager/signature/signature.go @@ -27,7 +27,7 @@ func (s *Validator) Validate(plugin *plugins.Plugin) *plugins.SignatureError { if plugin.Parent != nil { if plugin.IsCorePlugin() || plugin.Signature == plugins.SignatureInternal { s.log.Debug("Not setting descendant plugin's signature to that of root since it's core or internal", - "plugin", plugin.ID, "signature", plugin.Signature, "isCore", plugin.IsCorePlugin) + "plugin", plugin.ID, "signature", plugin.Signature, "isCore", plugin.IsCorePlugin()) } else { s.log.Debug("Setting descendant plugin's signature to that of root", "plugin", plugin.ID, "root", plugin.Parent.ID, "signature", plugin.Signature, "rootSignature", plugin.Parent.Signature)