Fix tsh windows builds#28357
Merged
rosstimothy merged 1 commit intomasterfrom Jun 30, 2023
Merged
Conversation
rosstimothy
force-pushed
the
tross/fix_tsh_windows
branch
from
8867786 to
06088a4
Compare
zmb3
approved these changes
Jun 28, 2023
rosstimothy
force-pushed
the
tross/fix_tsh_windows
branch
9 times, most recently
from
ad60237 to
343dac1
Compare
rosstimothy
force-pushed
the
tross/fix_tsh_windows
branch
from
343dac1 to
dfa2ef7
Compare
Contributor
Author
|
PTAL @jakule @zmb3 @GavinFrazar @r0mant |
jakule
approved these changes
Jun 29, 2023
public-teleport-github-review-bot
Bot
removed request for
GavinFrazar and
r0mant
Collaborator
|
/excludeflake TestAppLoginLeaf |
zmb3
approved these changes
Jun 30, 2023
#24864 added a dependency of lib/web into tsh which broke windows tsh builds because lib/web transiently depends on lib/srv which has linux specific code. This shuffles around a few things so that lib/web is no longer importing lib/srv at all by: - Indirectly using the srv.SessionController to apply session control for web ssh sessions - Moving the common reversetunnel interfaces into reversetunnelclient since lib/reversetunnel imports lib/srv/forward which imports lib/srv. - Directly converting mysql client errors in the connection tester instead of calling a common function.
rosstimothy
force-pushed
the
tross/fix_tsh_windows
branch
from
5163cc7 to
3129dca
Compare
rosstimothy
added a commit
that referenced
this pull request
Oct 5, 2023
Backports part of #28357 to branch/v13
rosstimothy
added a commit
that referenced
this pull request
Oct 5, 2023
Backports part of #28357 to branch/v13
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Oct 5, 2023
* Break client facing types out of reversetunnel package Backports part of #28357 to branch/v13 * Track user connections across clusters (#32688) Ensure that `proxy_ssh_sessions_total` is incremented in both the root and the leaf cluster if a session to a node in the leaf cluster is established through the root cluster. This now also prevents leaf clusters from terminating during a graceful shutdown if there is an active connection that was created from the root. Fixes #32605. * Track connections to direct dial nodes across clusters #32688 added support for tracking connections to sessions via a reverse tunnel node but failed to account for sessions to direct dial nodes.
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Oct 5, 2023
* Break client facing types out of reversetunnel package Backports part of #28357 to branch/v13 * Track user connections across clusters (#32688) Ensure that `proxy_ssh_sessions_total` is incremented in both the root and the leaf cluster if a session to a node in the leaf cluster is established through the root cluster. This now also prevents leaf clusters from terminating during a graceful shutdown if there is an active connection that was created from the root. Fixes #32605. * Track user connections across clusters (#32688) Ensure that `proxy_ssh_sessions_total` is incremented in both the root and the leaf cluster if a session to a node in the leaf cluster is established through the root cluster. This now also prevents leaf clusters from terminating during a graceful shutdown if there is an active connection that was created from the root. Fixes #32605. * Track connections to direct dial nodes across clusters #32688 added support for tracking connections to sessions via a reverse tunnel node but failed to account for sessions to direct dial nodes.
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
3 participants
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.
#24864 added a dependency of
lib/webinto tsh which broke windows tsh builds becauselib/webtransiently depends onlib/srvwhich has linux specific code. This shuffles around a few things so thatlib/webis no longer importinglib/srvat all by:srv.SessionControllerto apply session control for web ssh sessionsreversetunnelclientsincelib/reversetunnelimportslib/srv/forwardwhich importslib/srv.