backport of commit cb498b9 (#27901)

hc-github-team-nomad-core · chrisroberts · web-flow · commit 1743a25a4ef6 · 2026-05-05T09:43:42.000-07:00
Co-authored-by: Chris Roberts &lt;croberts@hashicorp.com&gt;
diff --git a/helper/pluginutils/loader/loader.go b/helper/pluginutils/loader/loader.go
@@ -174,6 +174,7 @@ func (l *PluginLoader) Dispense(name, pluginType string, config *base.AgentConfi
 	// Cast to the base type and set the config
 	b, ok := instance.Plugin().(base.BasePlugin)
 	if !ok {
+		instance.Kill() // Ensure plugin is not left running
 		return nil, fmt.Errorf("plugin %s doesn't implement base plugin interface", id)
 	}
 
@@ -184,6 +185,7 @@ func (l *PluginLoader) Dispense(name, pluginType string, config *base.AgentConfi
 	}
 
 	if err := b.SetConfig(c); err != nil {
+		instance.Kill() // ensure plugin is not left running
 		return nil, fmt.Errorf("setting config for plugin %s failed: %v", id, err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ func (l PluginLoader) Dispense(name, pluginType string, config base.AgentConfi`
`174`	`174`	`// Cast to the base type and set the config`
`175`	`175`	`b, ok := instance.Plugin().(base.BasePlugin)`
`176`	`176`	`if !ok {`
	`177`	`+ instance.Kill() // Ensure plugin is not left running`
`177`	`178`	`return nil, fmt.Errorf("plugin %s doesn't implement base plugin interface", id)`
`178`	`179`	`}`
`179`	`180`
`@@ -184,6 +185,7 @@ func (l PluginLoader) Dispense(name, pluginType string, config base.AgentConfi`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`if err := b.SetConfig(c); err != nil {`
	`188`	`+ instance.Kill() // ensure plugin is not left running`
`187`	`189`	`return nil, fmt.Errorf("setting config for plugin %s failed: %v", id, err)`
`188`	`190`	`}`
`189`	`191`