Guest24897/DockerCLI

Commit Graph

Author	SHA1	Message	Date
Ulysses Souza	92013600f9	Refactor plugins' vendor location on --help - The placement of the vendor is now in the end of the line. - A '*' is now added as suffix of plugins' top level commands. Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>	2019-02-21 17:54:11 +01:00
Ian Campbell	baabf6e8ad	Ensure that plugins are only listed once in help outputs. They were listed twice in `docker --help` (but not `docker help`), since the stubs were added in both `tryRunPluginHelp` and the `setHelpFunc` closure. Calling `AddPluginStubCommands` earlier in `setHelpFunc` before the call to `tryRunPluginHelp` is sufficient. Also it is no longer necessary to add just valid plugins (`tryRunPluginHelp` handles invalid plugins correctly) so remove that logic (which was in any case broken for e.g. `docker --help`). Update the e2e test to check for duplicate entries and also to test `docker --help` which was previously missed. Signed-off-by: Ian Campbell <ijc@docker.com>	2019-01-30 13:55:42 +00:00
Ian Campbell	f912b55bd1	Integrate CLI plugins into `docker help` output. To do this we add a stub `cobra.Command` for each installed plugin (only when invoking `help`, not for normal running). This requires a function to list all available plugins so that is added here. Signed-off-by: Ian Campbell <ijc@docker.com>	2019-01-30 13:44:06 +00:00

Author

SHA1

Message

Date

Ulysses Souza

92013600f9

Refactor plugins' vendor location on --help

- The placement of the vendor is now in the end of the line.
- A '*' is now added as suffix of plugins' top level commands.

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>

2019-02-21 17:54:11 +01:00

Ian Campbell

baabf6e8ad

Ensure that plugins are only listed once in help outputs.

They were listed twice in `docker --help` (but not `docker help`), since the
stubs were added in both `tryRunPluginHelp` and the `setHelpFunc` closure.

Calling `AddPluginStubCommands` earlier in `setHelpFunc` before the call to
`tryRunPluginHelp` is sufficient. Also it is no longer necessary to add just
valid plugins (`tryRunPluginHelp` handles invalid plugins correctly) so remove
that logic (which was in any case broken for e.g. `docker --help`).

Update the e2e test to check for duplicate entries and also to test `docker
--help` which was previously missed.

Signed-off-by: Ian Campbell <ijc@docker.com>

2019-01-30 13:55:42 +00:00

Ian Campbell

f912b55bd1

Integrate CLI plugins into `docker help` output.

To do this we add a stub `cobra.Command` for each installed plugin (only when
invoking `help`, not for normal running).

This requires a function to list all available plugins so that is added here.

Signed-off-by: Ian Campbell <ijc@docker.com>

2019-01-30 13:44:06 +00:00

3 Commits