fix: Fix panic on tsh device enroll --current-device#32694
Merged
codingllama merged 2 commits intomasterfrom Sep 28, 2023
Merged
fix: Fix panic on tsh device enroll --current-device#32694codingllama merged 2 commits intomasterfrom
tsh device enroll --current-device#32694codingllama merged 2 commits intomasterfrom
Conversation
github-actions
Bot
added
size/sm
tsh
codingllama
commented
Sep 27, 2023
| enrolled, err := c.Run(ctx, devicesClient, debug, token) | ||
| if err != nil { | ||
| return enrolled, outcome, trace.Wrap(err) | ||
| return currentDev, outcome, trace.Wrap(err) |
Contributor
Author
There was a problem hiding this comment.
This line is the bugfix proper, everything else is the cherry on top.
Contributor
Author
|
Unit tested and manually confirmed as well. |
zmb3
approved these changes
Sep 27, 2023
rosstimothy
approved these changes
Sep 27, 2023
public-teleport-github-review-bot
Bot
removed request for
camscale and
hugoShaka
Contributor
Author
|
Thanks for the quick review! |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
|
@codingllama See the table below for backport results.
|
This was referenced Sep 28, 2023
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.
Fix a panic that happens on
tsh device enroll --current-devicewhen the device wasn't previously registered and the subsequent enrollment fails (for example, because the cluster devices limit was reached).Fixes #31816.
Changelog: Fix panic on
tsh device enroll --current-devicewhen the cluster has reached its devices limit.