Allow tsh ssh to use predicate expressions/search keywords from proxy templates #43983
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
… templates While tsh ssh doesn't explicitly allow specifying predicate expressions or search keywords via the CLI they can be populated via a proxy template. However, the node resolution code in tsh only considered labels which results in confusing behavior, especially given the fact that debug logs indicate that a proxy template match was found and being used.
espadolini
approved these changes
Jul 10, 2024
| if err == nil { | ||
| return nil, trace.BadParameter("please use ssh subcommand with '--port=%v' flag instead of semicolon", port) | ||
| // Query for nodes if labels, fuzzy search, or predicate expressions were provided. | ||
| if len(tc.Labels) > 0 || len(tc.SearchKeywords) > 0 || tc.PredicateExpression != "" { |
There was a problem hiding this comment.
is there some more intrinsic way to write this check? or do we just kinda have to know that this is all and only what the ListResourcesRequest cares about for now, and any change will require manual updates in other places?
tigrato
approved these changes
Jul 10, 2024
public-teleport-github-review-bot
bot
removed request for
strideynet and
EdwardDowling
|
@rosstimothy See the table below for backport results.
|
This was referenced Jul 10, 2024
rosstimothy
added a commit
that referenced
this pull request
Jul 10, 2024
… templates (#43983) While tsh ssh doesn't explicitly allow specifying predicate expressions or search keywords via the CLI they can be populated via a proxy template. However, the node resolution code in tsh only considered labels which results in confusing behavior, especially given the fact that debug logs indicate that a proxy template match was found and being used.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 10, 2024
… templates (#43983) (#44031) While tsh ssh doesn't explicitly allow specifying predicate expressions or search keywords via the CLI they can be populated via a proxy template. However, the node resolution code in tsh only considered labels which results in confusing behavior, especially given the fact that debug logs indicate that a proxy template match was found and being used.
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.
While tsh ssh doesn't explicitly allow specifying predicate expressions or search keywords via the CLI they can be populated via a proxy template. However, the node resolution code in tsh only considered labels which results in confusing behavior, especially given the fact that debug logs indicate that a proxy template match was found and being used.
Changelog: Honor proxy templates in tsh ssh