Skip to content

Add support for include_enterprise_slug for the github join method#35860

Merged
strideynet merged 13 commits intomasterfrom
strideynet/support-github-enterprise-slug-in-github-join
Dec 19, 2023
Merged

Add support for include_enterprise_slug for the github join method#35860
strideynet merged 13 commits intomasterfrom
strideynet/support-github-enterprise-slug-in-github-join

Conversation

@strideynet
Copy link
Copy Markdown
Contributor

Closes #22834 - see this ticket for context.

This will enable the use of github joining from actions in the Teleport GitHub Enterprise account which leverages this feature. This allows the dog-fooding efforts to make use of Machine ID & GitHub Actions.

changelog: Support github joining from Enterprise accounts with include_enterprise_slug enabled.

@strideynet
Copy link
Copy Markdown
Contributor Author

CC @wadells - as per our discussion today, this is the patch needed for the upcoming work.

@github-actions
Copy link
Copy Markdown
Contributor

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

Comment thread api/proto/teleport/legacy/types/types.proto Outdated
Comment thread docs/pages/includes/provision-token/github-spec.mdx Outdated
@github-actions
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@wadells wadells left a comment

Choose a reason for hiding this comment

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

Enterprise slug says:

     /^\    /^\
    {  O}  {  O}
     \ /    \ /
     //     //
    //     //
   / ~----~/
 /         :          SHIP IT!
|  \________)
|        /
|        \_____
|              ^~-_____
 \                    ^~-_________
  |                               ^~-_
  \___________________________________~~____

Did you test at all in the wild, or will our Teleport use case be the first exercise of this code?

Co-authored-by: Krzysztof Skrzętnicki <krzysztof.skrzetnicki@goteleport.com>
@strideynet
Copy link
Copy Markdown
Contributor Author

Did you test at all in the wild

Yup, dm'ed you my test repo where I gave this a go 👍

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

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

@strideynet strideynet added this pull request to the merge queue Dec 19, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Dec 19, 2023
@strideynet strideynet added this pull request to the merge queue Dec 19, 2023
Merged via the queue into master with commit d653229 Dec 19, 2023
@strideynet strideynet deleted the strideynet/support-github-enterprise-slug-in-github-join branch December 19, 2023 14:13
@public-teleport-github-review-bot
Copy link
Copy Markdown

@strideynet See the table below for backport results.

Branch Result
branch/v14 Failed

strideynet added a commit that referenced this pull request Dec 19, 2023
#35860)

* Add support for `include_enterprise_slug` in `github` joining

* Correct assertiosn in github validator token test

* Remove `want` in TestIDTokenValidator_Validate

* Fix missing `should` in docs

Co-authored-by: Krzysztof Skrzętnicki <krzysztof.skrzetnicki@goteleport.com>

* Fix spelling of customize in docs

* Update operator CRDs

* Regen protos

* Apply suggestions from code review

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>

* Try both under same header

* Try H4

* Remove spurious period

* Use bold rather than heading

---------

Co-authored-by: Krzysztof Skrzętnicki <krzysztof.skrzetnicki@goteleport.com>
Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>
github-merge-queue Bot pushed a commit that referenced this pull request Dec 20, 2023
#35860) (#35900)

* Add support for `include_enterprise_slug` in `github` joining

* Correct assertiosn in github validator token test

* Remove `want` in TestIDTokenValidator_Validate

* Fix missing `should` in docs



* Fix spelling of customize in docs

* Update operator CRDs

* Regen protos

* Apply suggestions from code review



* Try both under same header

* Try H4

* Remove spurious period

* Use bold rather than heading

---------

Co-authored-by: Krzysztof Skrzętnicki <krzysztof.skrzetnicki@goteleport.com>
Co-authored-by: Paul Gottschling <paul.gottschling@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: support GitHub Enterprise Cloud unique token URL

5 participants