Merge pull request #1242 from geauxvirtual/tb/1211

Fix #1211: Return better error for plugin not found when starting a task

control/subscription_group.go

@@ -245,15 +245,9 @@ func (p *subscriptionGroups) validatePluginSubscription(pl core.SubscribedPlugin
 		"_block": "validate-plugin-subscription",
 		"plugin": fmt.Sprintf("%s:%d", pl.Name(), pl.Version()),
 	}).Info(fmt.Sprintf("validating dependencies for plugin %s:%d", pl.Name(), pl.Version()))
-	lp, err := p.pluginManager.get(fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", pl.TypeName(), pl.Name(), pl.Version()))
+	lp, err := p.pluginManager.get(key(pl))
 	if err != nil {
-		se := serror.New(fmt.Errorf("Plugin not found: type(%s) name(%s) version(%d)", pl.TypeName(), pl.Name(), pl.Version()))
-		se.SetFields(map[string]interface{}{
-			"name":    pl.Name(),
-			"version": pl.Version(),
-			"type":    pl.TypeName(),
-		})
-		serrs = append(serrs, se)
+		serrs = append(serrs, pluginNotFoundError(pl))
 		return serrs
 	}
 
@@ -396,7 +390,7 @@ func (s *subscriptionGroup) subscribePlugins(id string,
 	for i, sub := range plugins {
 		plg, err := s.pluginManager.get(key(sub))
 		if err != nil {
-			serrs = append(serrs, serror.New(err))
+			serrs = append(serrs, pluginNotFoundError(sub))
 			return serrs
 		}
 		plgs[i] = plg
@@ -448,9 +442,7 @@ func (p *subscriptionGroup) unsubscribePlugins(id string,
 			"version": plugin.Version(),
 			"_block":  "subscriptionGroup.unsubscribePlugins",
 		}).Debug("plugin unsubscription")
-		pool, err := p.pluginRunner.AvailablePlugins().getPool(
-			fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", plugin.TypeName(),
-				plugin.Name(), plugin.Version()))
+		pool, err := p.pluginRunner.AvailablePlugins().getPool(key(plugin))
 		if err != nil {
 			serrs = append(serrs, err)
 			return serrs
@@ -538,6 +530,16 @@ func comparePlugins(newPlugins,
 	return
 }
 
+func pluginNotFoundError(pl core.SubscribedPlugin) serror.SnapError {
+	se := serror.New(fmt.Errorf("Plugin not found: type(%s) name(%s) version(%d)", pl.TypeName(), pl.Name(), pl.Version()))
+	se.SetFields(map[string]interface{}{
+		"name":    pl.Name(),
+		"version": pl.Version(),
+		"type":    pl.TypeName(),
+	})
+	return se
+}
+
 func key(p core.SubscribedPlugin) string {
 	return fmt.Sprintf("%v"+core.Separator+"%v"+core.Separator+"%v", p.TypeName(), p.Name(), p.Version())
 }