Skip to content

cmd/docker: setFlagErrorFunc: don't load plugins for invalid flags#6526

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

Merged
vvoland merged 2 commits into from
Oct 3, 2025
Merged

cmd/docker: setFlagErrorFunc: don't load plugins for invalid flags #6526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b4fd0d
cmd/docker: setFlagErrorFunc: don't load plugins for invalid flags
thaJeztah Sep 30, 2025
b0201c8
cmd/docker: hideUnsupportedFeatures: remove unused error return
thaJeztah Sep 30, 2025
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
14 changes: 2 additions & 12 deletions cmd/docker/docker.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,15 +181,9 @@ func setFlagErrorFunc(dockerCli command.Cli, cmd *cobra.Command) {
// is called.
flagErrorFunc := cmd.FlagErrorFunc()
cmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error {
if err := pluginmanager.AddPluginCommandStubs(dockerCli, cmd.Root()); err != nil {
return err
}
if err := isSupported(cmd, dockerCli); err != nil {
return err
}
if err := hideUnsupportedFeatures(cmd, dockerCli); err != nil {
return err
}
return flagErrorFunc(cmd, err)
})
}
Expand DownExpand Up@@ -260,10 +254,7 @@ func setHelpFunc(dockerCli command.Cli, cmd *cobra.Command) {
ccmd.Println(err)
return
}
if err := hideUnsupportedFeatures(ccmd, dockerCli); err != nil {
ccmd.Println(err)
return
}
hideUnsupportedFeatures(ccmd, dockerCli)

defaultHelpFunc(ccmd, args)
})
Expand DownExpand Up@@ -563,7 +554,7 @@ func hideSubcommandIf(subcmd *cobra.Command, condition func(string) bool, annota
}
}

func hideUnsupportedFeatures(cmd *cobra.Command, details versionDetails) error {
func hideUnsupportedFeatures(cmd *cobra.Command, details versionDetails) {
var (
notExperimental = func(_ string) bool { return !details.ServerInfo().HasExperimental }
notOSType = func(v string) bool { return details.ServerInfo().OSType != "" && v != details.ServerInfo().OSType }
Expand DownExpand Up@@ -619,7 +610,6 @@ func hideUnsupportedFeatures(cmd *cobra.Command, details versionDetails) error {
hideSubcommandIf(subcmd, notSwarmStatus, "swarm")
hideSubcommandIf(subcmd, versionOlderThan, "version")
}
return nil
}

// Checks if a command or one of its ancestors is in the list
Expand Down
Loading