fix: remove empty arguments from launcher #1650
Merged
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
purkhusid
requested review from
alexeagle,
gregmagolan and
soldair
as code owners
gregmagolan
requested changes
Feb 17, 2020
internal/node/launcher.sh
Outdated
| @@ -224,13 +224,28 @@ if [ "${EXPECTED_EXIT_CODE}" -eq "0" ]; then | |||
| # handled by the node process. | |||
| # If we had merely forked a child process here, we'd be responsible | |||
| # for forwarding those OS interactions. | |||
| exec "${node}" "${LAUNCHER_NODE_OPTIONS[@]:-}" "${USER_NODE_OPTIONS[@]:-}" "${MAIN}" "${ARGS[@]:-}" | |||
| if (( ${#ARGS[@]} )); then | |||
There was a problem hiding this comment.
I believe if (( ${#ARGS} )); then is equivalent and sufficient here.
The duplication is not great. How about something like:
command="${node}" "${LAUNCHER_NODE_OPTIONS[@]:-}" "${USER_NODE_OPTIONS[@]:-}" "${MAIN}"
# If there are no arguments we skip the arguments because some programs
# such as grpc_tools_node_protoc_plugin in the grpc-tools do not handle empty arguments well
if (( ${#ARGS} )); then
command="${command}" "${ARGS[@]:-}"
fi
exec "${command}"
There was a problem hiding this comment.
There was a issue with using set -u and empty arrays with older versions of bash.
See more information here: https://stackoverflow.com/questions/7577052/bash-empty-array-expansion-with-set-u
|
@gregmagolan Added a test |
gregmagolan
approved these changes
Feb 18, 2020
| @@ -224,12 +224,12 @@ if [ "${EXPECTED_EXIT_CODE}" -eq "0" ]; then | |||
| # handled by the node process. | |||
| # If we had merely forked a child process here, we'd be responsible | |||
| # for forwarding those OS interactions. | |||
| exec "${node}" "${LAUNCHER_NODE_OPTIONS[@]:-}" "${USER_NODE_OPTIONS[@]:-}" "${MAIN}" "${ARGS[@]:-}" | |||
| exec "${node}" "${LAUNCHER_NODE_OPTIONS[@]:-}" "${USER_NODE_OPTIONS[@]:-}" "${MAIN}" ${ARGS[@]+"${ARGS[@]}"} | |||
gregmagolan
reviewed
Feb 18, 2020
| name = "binary_with_no_arguments", | ||
| data = ["empty_args_fail.js"], | ||
| entry_point = "empty_args_fail.js", | ||
| expected_exit_code = 0, |
There was a problem hiding this comment.
nit: expected_exit_code = 0 is redundant
gregmagolan
reviewed
Feb 18, 2020
|
|
||
| if (theArgs.length != 0) { | ||
| // Non-zero exit code if the argument list is not empty | ||
| process.exit(42) |
There was a problem hiding this comment.
I approve of the error code
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.
PR Type
What kind of change does this PR introduce?
What is the current behavior?
Currently the launcher script adds a empty argument to the end of all invocations.
Some programs do not like it and fail. An example is
grpc_tools_node_protoc_pluginin thegrpc-toolsNPM package.What is the new behavior?
If the argument list is empty we don't add an empty argument when invoking programs
Does this PR introduce a breaking change?