Fix GCP metadata errors crashing Teleport #42696
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
zmb3
reviewed
Jun 10, 2024
zmb3
approved these changes
Jun 10, 2024
codingllama
reviewed
Jun 10, 2024
codingllama
approved these changes
Jun 11, 2024
lib/service/service.go
Outdated
| return nil, trace.Wrap(err) | ||
| if err == nil { | ||
| cfg.Logger.InfoContext(supervisor.ExitContext(), | ||
| "Found an instance metadata service. Teleport will import labels from this cloud instance", |
There was a problem hiding this comment.
Suggestion: Since you have 2 sentences here I would keep the full stop, I think it's fine in cases like this.
Suggested change
| "Found an instance metadata service. Teleport will import labels from this cloud instance", | |
| "Found an instance metadata service. Teleport will import labels from this cloud instance.", |
public-teleport-github-review-bot
bot
removed the request for review
from marcoandredinis
|
/excludeflake * |
atburke
force-pushed
the
atburke/gcp-metadata-fixes
branch
from
ad421d0
to
22a4f65
Compare
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
This was referenced Jun 12, 2024
ptgott
pushed a commit
that referenced
this pull request
Jun 12, 2024
ptgott
added a commit
that referenced
this pull request
Jun 12, 2024
* Update host user groups for existing users (#41919) This change fixes a bug in host user creation where Teleport would not update the groups of a returning user if groups were changed in the user's role. * improve dynamodb permission error msg (#42855) * improve dynamodb permission error msg * Update lib/backend/dynamo/atomicwrite.go Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> --------- Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> * Fix GCP metadata errors crashing Teleport (#42696) * Web: Fix differing duration between unified resource and access request page (#42742) * Web: refactor and fix anti-pattern in access request * Update affected teleterm files * Address CR and fix updating duration should update pending * Fix test and stories * Reorganize Access Controls guides Move Access Controls giudes into References or Admin Guides, as appropriate. Also reorganizes the Admin Guides section to reduce the size of the table of contents page. --------- Co-authored-by: Andrew Burke <31974658+atburke@users.noreply.github.com> Co-authored-by: Forrest <30576607+fspmarshall@users.noreply.github.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> Co-authored-by: Lisa Kim <lisa@goteleport.com>
ptgott
added a commit
that referenced
this pull request
Jun 12, 2024
* Update host user groups for existing users (#41919) This change fixes a bug in host user creation where Teleport would not update the groups of a returning user if groups were changed in the user's role. * improve dynamodb permission error msg (#42855) * improve dynamodb permission error msg * Update lib/backend/dynamo/atomicwrite.go Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> --------- Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> * Fix GCP metadata errors crashing Teleport (#42696) * Web: Fix differing duration between unified resource and access request page (#42742) * Web: refactor and fix anti-pattern in access request * Update affected teleterm files * Address CR and fix updating duration should update pending * Fix test and stories * Reorganize Access Controls guides Move Access Controls giudes into References or Admin Guides, as appropriate. Also reorganizes the Admin Guides section to reduce the size of the table of contents page. --------- Co-authored-by: Andrew Burke <31974658+atburke@users.noreply.github.com> Co-authored-by: Forrest <30576607+fspmarshall@users.noreply.github.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> Co-authored-by: Lisa Kim <lisa@goteleport.com>
ptgott
added a commit
that referenced
this pull request
Jun 17, 2024
* Update host user groups for existing users (#41919) This change fixes a bug in host user creation where Teleport would not update the groups of a returning user if groups were changed in the user's role. * improve dynamodb permission error msg (#42855) * improve dynamodb permission error msg * Update lib/backend/dynamo/atomicwrite.go Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> --------- Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> * Fix GCP metadata errors crashing Teleport (#42696) * Web: Fix differing duration between unified resource and access request page (#42742) * Web: refactor and fix anti-pattern in access request * Update affected teleterm files * Address CR and fix updating duration should update pending * Fix test and stories * Reorganize Access Controls guides Move Access Controls giudes into References or Admin Guides, as appropriate. Also reorganizes the Admin Guides section to reduce the size of the table of contents page. --------- Co-authored-by: Andrew Burke <31974658+atburke@users.noreply.github.com> Co-authored-by: Forrest <30576607+fspmarshall@users.noreply.github.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> Co-authored-by: Lisa Kim <lisa@goteleport.com>
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.
This change:
Fixes #42312.
Changelog: Fixed crashes related to importing GCP labels