Skip to content

Port gitlab join method to new join service#61203

Merged
timothyb89 merged 4 commits intomasterfrom
timothyb89/new-join-service-gitlab
Nov 13, 2025
Merged

Port gitlab join method to new join service#61203
timothyb89 merged 4 commits intomasterfrom
timothyb89/new-join-service-gitlab

Conversation

@timothyb89
Copy link
Copy Markdown
Contributor

@timothyb89 timothyb89 commented Nov 11, 2025

This ports the gitlab join method to the new join service.

The gitlab package was moved to lib/join/ with minimal changes, token verification was moved into lib/join/gitlab so it could be reused between both legacy and new endpoints, and a small adapter was added to provide backwards compatibility.

Successfully tested on public GitLab:

  • From an old client to a cloud tenant running this branch
  • From a new client to a cloud tenant running this branch
  • From a new client to a cloud tenant running an old branch

(Technically I used a build off #61205 which contains both this port and GCP, which is based on this branch.)

See also: RFD 27e

This ports the `gitlab` join method to the new join service.

The `gitlab` package was moved to `lib/join/` with minimal changes,
token verification was moved into `lib/join/gitlab` so it could be
reused between both legacy and new endpoints, and a small adapter was
added to provide backwards compatibility.

See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md)
@timothyb89 timothyb89 marked this pull request as ready for review November 12, 2025 00:17
@timothyb89 timothyb89 added the no-changelog Indicates that a PR does not require a changelog entry label Nov 12, 2025
Comment thread lib/join/gitlab/gitlab.go Outdated
Validator Validator
}

func (p *CheckIDTokenParams) checkAndSetDefaults() error {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Since there is no setting of defaults and this looks to only be doing input validation rename the function to indicate as such?

Suggested change
func (p *CheckIDTokenParams) checkAndSetDefaults() error {
func (p *CheckIDTokenParams) validate() error {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, I'll also change that in #61205

@timothyb89 timothyb89 added this pull request to the merge queue Nov 13, 2025
Merged via the queue into master with commit e1d294c Nov 13, 2025
42 checks passed
@timothyb89 timothyb89 deleted the timothyb89/new-join-service-gitlab branch November 13, 2025 02:34
timothyb89 added a commit that referenced this pull request Nov 20, 2025
* Port `gitlab` join method to new join service

This ports the `gitlab` join method to the new join service.

The `gitlab` package was moved to `lib/join/` with minimal changes,
token verification was moved into `lib/join/gitlab` so it could be
reused between both legacy and new endpoints, and a small adapter was
added to provide backwards compatibility.

See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md)

* Fix imports

* Add gitlab to whitelist, reorder entries alphabetically

* Rename checkAndSetDefaults() to validate()
github-merge-queue bot pushed a commit that referenced this pull request Nov 25, 2025
* Port `gitlab` join method to new join service

This ports the `gitlab` join method to the new join service.

The `gitlab` package was moved to `lib/join/` with minimal changes,
token verification was moved into `lib/join/gitlab` so it could be
reused between both legacy and new endpoints, and a small adapter was
added to provide backwards compatibility.

See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md)

* Fix imports

* Add gitlab to whitelist, reorder entries alphabetically

* Rename checkAndSetDefaults() to validate()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog Indicates that a PR does not require a changelog entry size/md

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants