Skip to content

Fix panic running plugin subcommands with nil context #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xheggs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix panic running plugin subcommands with nil context #1708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkg/cmd/plugin_cmds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,15 @@ func addPluginSubcommandStubs(parent *cobra.Command, commands []plugins.CommandI

// runPluginCmd hands off to the plugin itself to take over
func (ptc *pluginTemplateCmd) runPluginCmd(cmd *cobra.Command, args []string) error {
ctx := withSIGTERMCancel(cmd.Context(), func() {
// Plugin subcommand stubs can reach this path with a nil command context,
// which makes withSIGTERMCancel -> context.WithCancel panic ("cannot create
// context from nil parent"). Fall back to a background context, mirroring the
// guard already used on the help path above.
parentCtx := cmd.Context()
if parentCtx == nil {
parentCtx = context.Background()
}
ctx := withSIGTERMCancel(parentCtx, func() {
log.WithFields(log.Fields{
"prefix": "cmd.pluginCmd.runPluginCmd",
}).Debug("Ctrl+C received, cleaning up...")
Expand Down