Port gcp join method to new join service#61205
Merged
timothyb89 merged 3 commits intomasterfrom Nov 18, 2025
Merged
Conversation
timothyb89
force-pushed
the
timothyb89/new-join-service-gcp
branch
2 times, most recently
from
a076117 to
cd230b0
Compare
timothyb89
added
the
no-changelog
timothyb89
commented
Nov 12, 2025
|
|
||
| // isGCPZoneInLocation checks if a zone belongs to a location, which can be | ||
| // either a zone or region. | ||
| func isGCPZoneInLocation(rawLocation, rawZone string) bool { |
Contributor
Author
There was a problem hiding this comment.
Review note, I pulled this into this package since it was only actually used here. The test lived in a different package which required it to be exported despite only being used in this same file. I removed the export and moved the unit tests here.
timothyb89
commented
Nov 12, 2025
|
|
||
| // Where possible, try to return any extracted claims along with the error | ||
| // to improve audit logs for failed join attempts. | ||
| return claims, trace.Wrap(err) |
Contributor
Author
There was a problem hiding this comment.
Minor behavior change: we didn't return claims on rule verification failure before, which has now been fixed. (This is just for auditing purposes, as the comment indicates.)
Base automatically changed from
timothyb89/new-join-service-gitlab
to
master
November 13, 2025 02:34
This ports the `gcp` join method to the new join service. It moves join-related code from `lib/gcp` to `lib/join/gcp`, extracts common joining logic to `lib/join/gcp` for reuse between the legacy and new entrypoints, and adds a compatibility layer for use by the legacy client. See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md)
timothyb89
force-pushed
the
timothyb89/new-join-service-gcp
branch
from
9e625a3 to
3a62144
Compare
timothyb89
requested review from
nklaassen
and removed request for
codingllama and
flyinghermit
strideynet
approved these changes
Nov 14, 2025
nklaassen
approved these changes
Nov 17, 2025
public-teleport-github-review-bot
bot
removed the request for review
from boxofrad
Contributor
|
@timothyb89 See the table below for backport results.
|
timothyb89
added a commit
that referenced
this pull request
Nov 26, 2025
* Port `gcp` join method to new join service This ports the `gcp` join method to the new join service. It moves join-related code from `lib/gcp` to `lib/join/gcp`, extracts common joining logic to `lib/join/gcp` for reuse between the legacy and new entrypoints, and adds a compatibility layer for use by the legacy client. See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md) * Add GCP to new join service whitelist * Rename checkAndSetDefaults() to validate()
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 1, 2025
* Port `gcp` join method to new join service This ports the `gcp` join method to the new join service. It moves join-related code from `lib/gcp` to `lib/join/gcp`, extracts common joining logic to `lib/join/gcp` for reuse between the legacy and new entrypoints, and adds a compatibility layer for use by the legacy client. See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md) * Add GCP to new join service whitelist * Rename checkAndSetDefaults() to validate()
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.
This ports the
gcpjoin method to the new join service. It moves join-related code fromlib/gcptolib/join/gcp, extracts common joining logic tolib/join/gcpfor reuse between the legacy and new entrypoints, and adds a compatibility layer for use by the legacy client.Successfully tested using a GCP instance and a cloud tenant:
See also: RFD 27e