feat(bash-hook): Add cli arg to override sentry-cli command #852
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
When using `sentry-cli` through Docker, the bash hook does not work as: 1. The inferred path of `sentry-cli` becomes the path inside the container, and does not apply to the host 2. The files used for reporting live outside the container and they need to be mapped to the container when running it. This patche choses the more flexible `--cli` argument to solve both problemes where one can do something like ```docker run --rm getsentry/sentry-cli bash-hook --cli='docker run --rm -v "$_SENTRY_TRACEBACK_FILE:$SENTRY_TRACEBACK_FILE" -v "$_SENTRY_LOG_FILE:$_SENTRY_LOG_FILE" getsentry/sentry-cli ``` Now that's ugly as hell, yes and we may opt to have auto detection for running inside docker to handle this. The downside is then we'd not support any other container engine.
BYK
commented
Oct 30, 2020
src/commands/bash_hook.rs
Outdated
Comment on lines
197
to
204
| if matches.is_present("cli") { | ||
| script = script.replace( | ||
| "___SENTRY_CLI___", | ||
| &env::current_exe().unwrap().display().to_string(), | ||
| ); | ||
| matches.value_of("cli").unwrap() | ||
| ); | ||
| } else { | ||
| script = script.replace("__SENTRY_CLI__", &env::current_exe().unwrap().display().to_string()); | ||
| } |
Member
Author
There was a problem hiding this comment.
Instead of this, I tried every possible variation of matcher and unwrap_or_else etc. but they gave me hell with the temporary return value of the env::current_exe().unwrap().display().to_string() call or some weird mismatch between String and str types.
Open to suggestions to make this more "rustic".
Contributor
There was a problem hiding this comment.
.replace(
"__SENTRY_CLI__",
matches
.value_of("cli")
.unwrap_or(&env::current_exe().unwrap().display().to_string()),
);
Member
Author
There was a problem hiding this comment.
@kamilogorek that runs the expression &env::current_exe().unwrap().display().to_string() for the fallback unconditionally, which is why I went with this path (after exhausting the path of closures)
Contributor
There was a problem hiding this comment.
True, that'll be eagerly evaluated, and returning a ref from unwrap_or_else is tricky.
kamilogorek
suggested changes
Nov 2, 2020
src/commands/bash_hook.rs
Outdated
Comment on lines
197
to
204
| if matches.is_present("cli") { | ||
| script = script.replace( | ||
| "___SENTRY_CLI___", | ||
| &env::current_exe().unwrap().display().to_string(), | ||
| ); | ||
| matches.value_of("cli").unwrap() | ||
| ); | ||
| } else { | ||
| script = script.replace("__SENTRY_CLI__", &env::current_exe().unwrap().display().to_string()); | ||
| } |
Contributor
There was a problem hiding this comment.
.replace(
"__SENTRY_CLI__",
matches
.value_of("cli")
.unwrap_or(&env::current_exe().unwrap().display().to_string()),
);
kamilogorek
approved these changes
Nov 2, 2020
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.
When using
sentry-clithrough Docker, the bash hook does not work as:sentry-clibecomes the path inside the container, and does not apply to the hostThis patch chooses the more flexible
--cliargument to solve both problems where one can do something likedocker run --rm getsentry/sentry-cli bash-hook --cli='docker run --rm -v "$_SENTRY_TRACEBACK_FILE:$SENTRY_TRACEBACK_FILE" -v "$_SENTRY_LOG_FILE:$_SENTRY_LOG_FILE" getsentry/sentry-cliNow that's ugly as hell, yes and we may opt to have auto detection for running inside docker to handle this. The downside is then we'd not support any other container engine.