MWI: Wait for bot identity before starting services #55610
Merged
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
boxofrad
added
machine-id
no-changelog
strideynet
approved these changes
Jun 11, 2025
boxofrad
force-pushed
the
boxofrad/wait-for-client
branch
from
0206b60 to
b0ac950
Compare
timothyb89
approved these changes
Jun 16, 2025
lib/tbot/service_database_tunnel.go
Outdated
| select { | ||
| case <-s.botIdentityReadyCh: | ||
| case <-ctx.Done(): | ||
| return alpnproxy.LocalProxyConfig{}, nil |
There was a problem hiding this comment.
Kind of nitpick territory, but will this empty value be handled optimally downstream? From my quick read I think alpnproxy.NewLocalProxy() will probably produce an error (due to CheckAndSetDefaults() failing) so we might still log a confusing error instead of exiting quietly.
There was a problem hiding this comment.
Good catch actually! Rather than returning a nil error, maybe we should return ctx.Err()?
public-teleport-github-review-bot
bot
removed the request for review
from kiosion
boxofrad
force-pushed
the
boxofrad/wait-for-client
branch
from
b0ac950 to
b998c1a
Compare
boxofrad
force-pushed
the
boxofrad/implement-rfd-0216
branch
from
14ff176 to
1ceb85e
Compare
boxofrad
force-pushed
the
boxofrad/wait-for-client
branch
3 times, most recently
from
ef93354 to
d8260bf
Compare
boxofrad
force-pushed
the
boxofrad/wait-for-client
branch
from
9ac6e92 to
58ff129
Compare
boxofrad
force-pushed
the
boxofrad/wait-for-client
branch
from
58ff129 to
e298c5a
Compare
boxofrad
added a commit
that referenced
this pull request
Jun 18, 2025
Backport #55610 to branch/v17
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.
Builds on #55609 to wait for the internal bot identity to be ready before starting services, to avoid spamming the logs with errors.