Repository navigation
Report an unparseable shim command line instead of panicking - #1181
Open
arpitjain099 wants to merge 1 commit into
Open
arpitjain099 wants to merge 1 commit into
arpitjain099 wants to merge 1 commit into
Conversation
Signed-off-by: Arpit Jain <arpitjain099@gmail.com>
This branch has not been deployed
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
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.
Fixes #1180.
shim_mainunwraps the result ofparse, so any flag the shim does not define,--versionincluded, aborts with a panic and exit 101 instead of saying what was wrong.argv0moves above the parse so the message can name the binary, and the error goes to stderr with exit 1.I could not build a shim binary on macOS (procfs is Linux only), so I reproduced the two behaviours against the same
containerd_shim::parsein a Linux container, one binary per shape:cargo check -p containerd-shimkitandcargo fmt -p containerd-shimkit -- --checkare clean, both run in arust:1.91-slimcontainer to match the pinned toolchain.There is no unit test here because the branch ends in
std::process::exit, which a test in this crate cannot observe. If you would rather have coverage, the parse and the exit could be split so the decision is testable, but that is a bigger change than the bug needs, so I left it.