From 2628022275ef64fde95545abe4634b4bd7177844 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 15 Sep 2017 08:51:46 -0400 Subject: PLT-7622 Improvements to server handling of webapp plugins (#7445) * Improvements to server handling of webapp plugins * Fix newline * Update manifest function names --- plugin/pluginenv/environment.go | 4 ++-- plugin/pluginenv/environment_test.go | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'plugin') diff --git a/plugin/pluginenv/environment.go b/plugin/pluginenv/environment.go index e4a7f1b3b..805b33e66 100644 --- a/plugin/pluginenv/environment.go +++ b/plugin/pluginenv/environment.go @@ -66,7 +66,7 @@ func (env *Environment) Plugins() ([]*model.BundleInfo, error) { } // Returns a list of all currently active plugins within the environment. -func (env *Environment) ActivePlugins() ([]*model.BundleInfo, error) { +func (env *Environment) ActivePlugins() []*model.BundleInfo { env.mutex.RLock() defer env.mutex.RUnlock() @@ -75,7 +75,7 @@ func (env *Environment) ActivePlugins() ([]*model.BundleInfo, error) { activePlugins = append(activePlugins, p.BundleInfo) } - return activePlugins, nil + return activePlugins } // Returns the ids of the currently active plugins. diff --git a/plugin/pluginenv/environment_test.go b/plugin/pluginenv/environment_test.go index f24ef8d3d..c11644b35 100644 --- a/plugin/pluginenv/environment_test.go +++ b/plugin/pluginenv/environment_test.go @@ -127,8 +127,7 @@ func TestEnvironment(t *testing.T) { assert.NoError(t, err) assert.Len(t, plugins, 3) - activePlugins, err := env.ActivePlugins() - assert.NoError(t, err) + activePlugins := env.ActivePlugins() assert.Len(t, activePlugins, 0) assert.Error(t, env.ActivatePlugin("x")) @@ -150,8 +149,7 @@ func TestEnvironment(t *testing.T) { assert.NoError(t, env.ActivatePlugin("foo")) assert.Equal(t, env.ActivePluginIds(), []string{"foo"}) - activePlugins, err = env.ActivePlugins() - assert.NoError(t, err) + activePlugins = env.ActivePlugins() assert.Len(t, activePlugins, 1) assert.Error(t, env.ActivatePlugin("foo")) -- cgit v1.2.3-1-g7c22