Skip to content

Machine ID: More rules to gitlab joining and add globby matching to some fields#34290

Merged
strideynet merged 13 commits intomasterfrom
strideynet/more-gitlab-joining-control
Nov 9, 2023
Merged

Machine ID: More rules to gitlab joining and add globby matching to some fields#34290
strideynet merged 13 commits intomasterfrom
strideynet/more-gitlab-joining-control

Conversation

@strideynet
Copy link
Copy Markdown
Contributor

@strideynet strideynet commented Nov 7, 2023

GitLab have paid their OIDC impl some attention and there's a bunch of additional fields we can integrate with now.

Closes #34199

I've also added rudimentary globby matching support to sub, ref, namespace_path and project_path - this allows for more flexibility in organisations that have a large number of repositories and use GitLab's subgrouping mechanism.

changelog: New rule fields supported for gitlab joining and globby matching support for sub, ref, namespace_path and project_path. See https://goteleport.com/docs/machine-id/reference/gitlab/ for details.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 7, 2023

🤖 Vercel preview here: https://docs-duygl3bl0-goteleport.vercel.app/docs/ver/preview

@strideynet
Copy link
Copy Markdown
Contributor Author

Manually requesting the people the bot attempted to assign - but failed due to the GitHub perms issue.

Comment thread api/types/provisioning.go Outdated
Comment thread api/proto/teleport/legacy/types/types.proto Outdated
Comment thread lib/auth/join_gitlab.go Outdated
Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 7, 2023

🤖 Vercel preview here: https://docs-b7gci0nlg-goteleport.vercel.app/docs/ver/preview

Copy link
Copy Markdown
Contributor

@ptgott ptgott left a comment

Choose a reason for hiding this comment

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

Approved with minor comments

Comment thread docs/pages/machine-id/reference/gitlab.mdx Outdated
Comment thread docs/pages/machine-id/reference/gitlab.mdx Outdated
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from zmb3 November 7, 2023 18:41
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 9, 2023

🤖 Vercel preview here: https://docs-ihejyudi7-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 9, 2023

🤖 Vercel preview here: https://docs-mj4v4q4mw-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 9, 2023

🤖 Vercel preview here: https://docs-6d7vfnuan-goteleport.vercel.app/docs/ver/preview

@strideynet strideynet added this pull request to the merge queue Nov 9, 2023
Merged via the queue into master with commit f2f864f Nov 9, 2023
@strideynet strideynet deleted the strideynet/more-gitlab-joining-control branch November 9, 2023 17:10
@public-teleport-github-review-bot
Copy link
Copy Markdown

@strideynet See the table below for backport results.

Branch Result
branch/v12 Failed
branch/v13 Failed
branch/v14 Failed

strideynet added a commit that referenced this pull request Nov 10, 2023
… some fields (#34290)

* Add fields for to-be-supported token claims

* Modify validation to include new field

* Add comparisons for new fields to joining logic

* Add support for globby matching for sub, ref, namespace_path and project_path

* Document which fields support globby matching

* Add tests for join rule engine changes

* Regenerate operator CRDs

* Add docs for new fields

* Correct punctuation in error message

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>

* Correctly use GoDoc-esque comments

* Address docs comments

* Reuse glob matching code

* Correct type of RunnerID field

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
strideynet added a commit that referenced this pull request Nov 10, 2023
… some fields (#34290)

* Add fields for to-be-supported token claims

* Modify validation to include new field

* Add comparisons for new fields to joining logic

* Add support for globby matching for sub, ref, namespace_path and project_path

* Document which fields support globby matching

* Add tests for join rule engine changes

* Regenerate operator CRDs

* Add docs for new fields

* Correct punctuation in error message

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>

* Correctly use GoDoc-esque comments

* Address docs comments

* Reuse glob matching code

* Correct type of RunnerID field

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
github-merge-queue Bot pushed a commit that referenced this pull request Nov 13, 2023
… some fields (#34290) (#34465)

* Add fields for to-be-supported token claims

* Modify validation to include new field

* Add comparisons for new fields to joining logic

* Add support for globby matching for sub, ref, namespace_path and project_path

* Document which fields support globby matching

* Add tests for join rule engine changes

* Regenerate operator CRDs

* Add docs for new fields

* Correct punctuation in error message



* Correctly use GoDoc-esque comments

* Address docs comments

* Reuse glob matching code

* Correct type of RunnerID field

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
github-merge-queue Bot pushed a commit that referenced this pull request Nov 13, 2023
… some fields (#34290) (#34464)

* Add fields for to-be-supported token claims

* Modify validation to include new field

* Add comparisons for new fields to joining logic

* Add support for globby matching for sub, ref, namespace_path and project_path

* Document which fields support globby matching

* Add tests for join rule engine changes

* Regenerate operator CRDs

* Add docs for new fields

* Correct punctuation in error message



* Correctly use GoDoc-esque comments

* Address docs comments

* Reuse glob matching code

* Correct type of RunnerID field

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Machine ID: more options in allow rules with support of regex/glob matching for gitlab join method

4 participants