Include plugins in docker --badopt help output
#1850
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
April 26, 2019 10:43
Signed-off-by: Ian Campbell <[email protected]>
Previously `docker --badopt` would always include experimental commands even if experimental was not enabled. Signed-off-by: Ian Campbell <[email protected]>
Previously `docker --badopt` output would not include CLI plugins. Fixes docker#1813 Signed-off-by: Ian Campbell <[email protected]>
The linter is complaining:
cmd/docker/docker.go:72:23:warning: dockerCli can be github.com/docker/cli/cli/command.Cli (interfacer)
Unclear precisely which change in the preceeding commits caused it to notice
this possibility.
Signed-off-by: Ian Campbell <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #1850 +/- ##
==========================================
- Coverage 56.75% 56.74% -0.02%
==========================================
Files 309 309
Lines 21658 21662 +4
==========================================
Hits 12292 12292
- Misses 8469 8473 +4
Partials 897 897 |
Contributor
Author
|
Linter complained: Since I'm only adding new function calls to |
Member
|
ping @silvin-lubecki @tiborvass ptal |
Contributor
|
noice! 👍 :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
I arranged to cli plugins include in the output of
docker --badopt, fixes #1813.In the process of writing the e2e test I also noticed that the
docker --badoptunconditionally included experimental (builtin) commands so I fixed that too.Finally since I was adding a new subtest to an existing test, I took the chance to use
t.Runfor all of the subtests.- How I did it
Including cli plugins is achieved by calling
pluginmanager.AddPluginCommandStubsin the flag errro callback function. Handling experimental commands properly is handled by callinghideUnsupportedFeaturesin the same callback.- How to verify it
There is a new e2e test.
- Description for the changelog
/cc @SvenDowideit.