cli-plugins: fix when plugin does not use PersistentPreRun* hooks #1853
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
This regressed in 3af168c ("Ensure plugins can use `PersistentPreRunE` again.") but this wasn't noticed because the helloworld test plugin has it's own `PersistentPreRunE` which has the effect of deferring the resolution of the global variable. In the case where the hook isn't used the variable is resolved during `newPluginCommand` which is before the global variable was set. Initialize the plugin command with a stub function wrapping the call to the (global) hook, this defers resolving the variable until after it has been set, otherwise the initial value (`nil`) is used in the struct. Signed-off-by: Ian Campbell <ijc@docker.com>
Codecov Report
@@ Coverage Diff @@
## master #1853 +/- ##
=======================================
Coverage 56.75% 56.75%
=======================================
Files 309 309
Lines 21658 21658
=======================================
Hits 12292 12292
Misses 8469 8469
Partials 897 897 |
silvin-lubecki
approved these changes
May 13, 2019
Contributor
silvin-lubecki
left a comment
silvin-lubecki
left a comment
There was a problem hiding this comment.
LGTM, thank you @ijc 🦁
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This regressed in 3af168c ("Ensure plugins can use
PersistentPreRunEagain.") but this wasn't noticed because the helloworld test plugin has it's
own
PersistentPreRunEwhich has the effect of deferring the resolution of theglobal variable. In the case where the hook isn't used the variable is resolved
during
newPluginCommandwhich is before the global variable was set.Initialize the plugin command with a stub function wrapping the call to the
(global) hook, this defers resolving the variable until after it has been set,
otherwise the initial value (
nil) is used in the struct.Signed-off-by: Ian Campbell ijc@docker.com
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)