Fix broken version check in tbot's tshwrap
#13034
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
`tshwrap` performs a tsh version check to ensure it has the functionality we need. Unfortunately, during a final refactoring before merging, we changed the function signature of `capture()` to require an explicit path to a `tsh` binary but in a way that was unfortunately not caught by the compiler. The previous syntax meant we just tried to execute the first argument, i.e. `version`, which is never what we want. This PR correctly passes the tsh path to `capture()` to fix the version check.
strideynet
approved these changes
May 31, 2022
codingllama
approved these changes
May 31, 2022
|
@timothyb89 See the table below for backport results.
|
r0mant
added a commit
that referenced
this pull request
May 31, 2022
* Fix broken version check in tbot's `tshwrap` `tshwrap` performs a tsh version check to ensure it has the functionality we need. Unfortunately, during a final refactoring before merging, we changed the function signature of `capture()` to require an explicit path to a `tsh` binary but in a way that was unfortunately not caught by the compiler. The previous syntax meant we just tried to execute the first argument, i.e. `version`, which is never what we want. This PR correctly passes the tsh path to `capture()` to fix the version check. * Release 9.3.2 Co-authored-by: Roman Tkachenko <roman@goteleport.com>
Closed
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.
tshwrapperforms a tsh version check to ensure it has the functionality we need. Unfortunately, during a final refactoring before merging, we changed the function signature ofcapture()to require an explicit path to atshbinary but in a way that was unfortunately not caught by the compiler. The previous syntax meant we just tried to execute the first argument, i.e.version, which is never what we want.This PR correctly passes the tsh path to
capture()to fix the version check.