fix broken alias check is buildx is installed as alias for builder #3795
Conversation
This file contains 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
Commit cbec75e updated `runDocker()` to load plugin-stubs before `processAliases()` was executed. As a result, plugin stubs were considered as "builtin commands", causing the alias verification to fail; Without alias installed: ```bash docker version Client: Version: 22.06.0-beta.0-140-g3dad26ca2.m API version: 1.42 Go version: go1.19.1 Git commit: 3dad26c Built: Wed Sep 28 22:36:09 2022 OS/Arch: darwin/arm64 Context: default ... ``` After running `docker buildx install`; ```bash ./build/docker buildx install cat ~/.docker/config.json { "aliases": { "builder": "buildx" } } ./build/docker version not allowed to alias with builtin "buildx" as target ``` This patch moves loading the stubs _after_ the call to `processAliases()`, so that verification passes. As an extra precaution, the `processAliases()` function is also updated to exclude plugin-stub commands. Note that cbec75e also introduced a performance regression, which may be related to the early loading of plugins (and creating stubs); it looks like various other code locations may also be loading plugins, for example `tryPluginRun()` calls `pluginmanager.PluginRunCommand()`, which also traverses plugin directories. We should look under what circumstances the plugin stub-commands are actually needed, and make sure that they're only created in those situations. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
ignore_stubs_in_aliases
branch
from
a8d2479
to
7af8aac
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #3795 +/- ##
==========================================
- Coverage 59.29% 59.29% -0.01%
==========================================
Files 288 288
Lines 24640 24641 +1
==========================================
Hits 14610 14610
- Misses 9160 9161 +1
Partials 870 870 |
|
thx; let me bring this one in 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Commit cbec75e (#3429) updated
runDocker()to load plugin-stubs beforeprocessAliases()was executed. As a result, plugin stubs were considered as "builtin commands", causing the alias verification to fail;Without alias installed:
After running
docker buildx install;This patch moves loading the stubs after the call to
processAliases(), so that verification passes. As an extra precaution, theprocessAliases()function is also updated to exclude plugin-stub commands.Note that cbec75e (#3429) also introduced a performance regression (#3621), which may be related to the early loading of plugins (and creating stubs); it looks like various other code locations may also be loading plugins, for example
tryPluginRun()callspluginmanager.PluginRunCommand(), which also traverses plugin directories.We should look under what circumstances the plugin stub-commands are actually needed, and make sure that they're only created in those situations.
- A picture of a cute animal (not mandatory but encouraged)