From 309a3dda605dbda6b9f6f769ea386764671ea5d3 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Wed, 18 Jul 2018 18:32:33 -0400 Subject: Support `server`, deprecate `backend` in plugin manifest (#9127) * Support `server`, deprecate `backend` in plugin manifest This lets us converge on the use of the term `server` everywhere instead of sometimes `backend` and sometimes `server`. We're still using `webapp` and will eventually support `mobile` as well. The plan is actually to rip out these deprecations as part of releasing 5.2, but I want to coordinate the extra additional breakage at the same time, so for now this is a backwards compatible change. * fix failing tests --- plugin/environment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/environment.go b/plugin/environment.go index 450078893..7adb0938d 100644 --- a/plugin/environment.go +++ b/plugin/environment.go @@ -192,7 +192,7 @@ func (env *Environment) Activate(id string) (reterr error) { } } - if pluginInfo.Manifest.Backend != nil { + if pluginInfo.Manifest.HasServer() { supervisor, err := newSupervisor(pluginInfo, env.logger, env.newAPIImpl(pluginInfo.Manifest)) if err != nil { return errors.Wrapf(err, "unable to start plugin: %v", id) -- cgit v1.2.3-1-g7c22