From 003b47dedffd5d6a9b0037859ade4d70307a7570 Mon Sep 17 00:00:00 2001 From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com> Date: Fri, 25 Jun 2021 18:26:21 -0400 Subject: [PATCH] Not referencing "unmanaged" plugins, per Mitchell's feedback. --- internal/plugin/factory.go | 14 +++++++------- internal/runner/operation.go | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/plugin/factory.go b/internal/plugin/factory.go index 436c74198a0..513c9dcccd1 100644 --- a/internal/plugin/factory.go +++ b/internal/plugin/factory.go @@ -96,10 +96,10 @@ func BuiltinFactory(name string, typ component.Type) interface{} { return Factory(cmd, typ) } -// UnmanagedPluginFactory produces a provider factory that uses the passed +// ReattachPluginFactory produces a provider factory that uses the passed // reattach information to connect to go-plugin processes that are already // running, and implements Instance against it. -func UnmanagedPluginFactory(reattach *plugin.ReattachConfig, typ component.Type) interface{} { +func ReattachPluginFactory(reattach *plugin.ReattachConfig, typ component.Type) interface{} { return func(log hclog.Logger) (interface{}, error) { config := pluginclient.ClientConfig(log) config.Logger = log @@ -115,13 +115,13 @@ func UnmanagedPluginFactory(reattach *plugin.ReattachConfig, typ component.Type) config.Plugins = plugins // Log that we're going to launch this - log.Info("Connecting to an unmanaged plugin", "type", typ, "Addr", reattach.Addr.String()) + log.Info("Connecting to a reattach plugin", "type", typ, "Addr", reattach.Addr.String()) // Connect to the plugin client := plugin.NewClient(config) rpcClient, err := client.Client() if err != nil { - log.Error("error creating unmanaged plugin client", "err", err) + log.Error("error creating reattach plugin client", "err", err) client.Kill() return nil, err } @@ -132,7 +132,7 @@ func UnmanagedPluginFactory(reattach *plugin.ReattachConfig, typ component.Type) if typ != component.MapperType { raw, err = rpcClient.Dispense(strings.ToLower(typ.String())) if err != nil { - log.Error("error requesting unmanaged plugin", "type", typ, "err", err) + log.Error("error requesting reattach plugin", "type", typ, "err", err) client.Kill() return nil, err } @@ -141,12 +141,12 @@ func UnmanagedPluginFactory(reattach *plugin.ReattachConfig, typ component.Type) // Request the mappers mappers, err := pluginclient.Mappers(client) if err != nil { - log.Error("error requesting unmanaged plugin mappers", "err", err) + log.Error("error requesting reattach plugin mappers", "err", err) client.Kill() return nil, err } - log.Debug("successfully reattached to an unmanaged plugin") + log.Debug("successfully reattached to a plugin") return &Instance{ Component: raw, Mappers: mappers, diff --git a/internal/runner/operation.go b/internal/runner/operation.go index a27eddd0487..4b632c37c8c 100644 --- a/internal/runner/operation.go +++ b/internal/runner/operation.go @@ -231,12 +231,12 @@ func (r *Runner) pluginFactories( } log.Debug("plugin search path", "path", pluginPaths) - // Look for any unmanaged plugins - var unmanagedPluginConfigs map[string]*goplugin.ReattachConfig - unmanagedPluginsStr := os.Getenv("WP_REATTACH_PLUGINS") - if unmanagedPluginsStr != "" { + // Look for any reattach plugins + var reattachPluginConfigs map[string]*goplugin.ReattachConfig + reattachPluginsStr := os.Getenv("WP_REATTACH_PLUGINS") + if reattachPluginsStr != "" { var err error - unmanagedPluginConfigs, err = parseReattachPlugins(unmanagedPluginsStr) + reattachPluginConfigs, err = parseReattachPlugins(reattachPluginsStr) if err != nil { return nil, err } @@ -248,10 +248,10 @@ func (r *Runner) pluginFactories( plog := log.With("plugin_name", pluginCfg.Name) plog.Debug("searching for plugin") - if reattachConfig, ok := unmanagedPluginConfigs[pluginCfg.Name]; ok { - plog.Debug(fmt.Sprintf("plugin %s is declared as running unmanaged", pluginCfg.Name)) + if reattachConfig, ok := reattachPluginConfigs[pluginCfg.Name]; ok { + plog.Debug(fmt.Sprintf("plugin %s is declared as running for reattachment", pluginCfg.Name)) for _, t := range pluginCfg.Types() { - if err := result[t].Register(pluginCfg.Name, plugin.UnmanagedPluginFactory(reattachConfig, t)); err != nil { + if err := result[t].Register(pluginCfg.Name, plugin.ReattachPluginFactory(reattachConfig, t)); err != nil { return nil, err } } @@ -294,17 +294,17 @@ func (r *Runner) pluginFactories( return result, perr } -// parse information on reattaching to unmanaged plugins out of a +// parse information on reattaching to reattach plugins out of a // JSON-encoded environment variable. func parseReattachPlugins(in string) (map[string]*goplugin.ReattachConfig, error) { - unmanangedPlugins := map[string]*goplugin.ReattachConfig{} + reattachConfigs := map[string]*goplugin.ReattachConfig{} if in != "" { in = strings.TrimRight(in, "'") in = strings.TrimLeft(in, "'") var m map[string]sdk.ReattachConfig err := json.Unmarshal([]byte(in), &m) if err != nil { - return unmanangedPlugins, fmt.Errorf("Invalid format for WP_REATTACH_PROVIDERS: %w", err) + return reattachConfigs, fmt.Errorf("Invalid format for WP_REATTACH_PROVIDERS: %w", err) } for p, c := range m { var addr net.Addr @@ -312,17 +312,17 @@ func parseReattachPlugins(in string) (map[string]*goplugin.ReattachConfig, error case "unix": addr, err = net.ResolveUnixAddr("unix", c.Addr.String) if err != nil { - return unmanangedPlugins, fmt.Errorf("Invalid unix socket path %q for %q: %w", c.Addr.String, p, err) + return reattachConfigs, fmt.Errorf("Invalid unix socket path %q for %q: %w", c.Addr.String, p, err) } case "tcp": addr, err = net.ResolveTCPAddr("tcp", c.Addr.String) if err != nil { - return unmanangedPlugins, fmt.Errorf("Invalid TCP address %q for %q: %w", c.Addr.String, p, err) + return reattachConfigs, fmt.Errorf("Invalid TCP address %q for %q: %w", c.Addr.String, p, err) } default: - return unmanangedPlugins, fmt.Errorf("Unknown address type %q for %q", c.Addr.String, p) + return reattachConfigs, fmt.Errorf("Unknown address type %q for %q", c.Addr.String, p) } - unmanangedPlugins[p] = &goplugin.ReattachConfig{ + reattachConfigs[p] = &goplugin.ReattachConfig{ Protocol: goplugin.Protocol(c.Protocol), ProtocolVersion: c.ProtocolVersion, Pid: c.Pid, @@ -331,7 +331,7 @@ func parseReattachPlugins(in string) (map[string]*goplugin.ReattachConfig, error } } } - return unmanangedPlugins, nil + return reattachConfigs, nil } // operationNoDataFunc is the function type for operations that are