[v18] Add Env0 join method (#60386) #60710
Merged
Conversation
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
timothyb89
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
|
Amplify deployment status
|
Contributor
Author
|
Note, this depends on a few PRs:
|
timothyb89
commented
Oct 29, 2025
timothyb89
force-pushed
the
timothyb89/v18/env0-joining
branch
from
ced0cac to
03ac710
Compare
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
* Add Env0 method This adds a new `env0` join method to support joining from env0 workflows, and especially the embedded tbot in the Terraform provider when running on env0. This is the first OIDC join method on the new join service, and will not support legacy joining. As such, it won't be backported beyond v18. Closes #53798 changelog: Add new `env0` join method to support joining within Env0 workflows * Fix imports * Fix failing test * Add env0 token source * Fix missing env0 join method in tbot * Fix env0 validation This fixes some issues in env0 token validation: - azp check is disabled since it's set to a random (ish) value - Use correct audience URL (their docs specified the wrong value) * Fix incorrect date in new file copyright header * Fix generated tfschema * Fix failing test after adding the token source * First round of code review * Add example token claims in comment * Move common OIDC handling logic into a separate handler Specific validation logic is now separate and the validator is passed as an argument to a generic `handleOIDCJoin()` handler. * Fix imports * Rename joinclient/join_env0.go to join_oidc.go
timothyb89
force-pushed
the
timothyb89/v18/env0-joining
branch
from
03ac710 to
8b6a05e
Compare
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
timothyb89
changed the base branch from
nklaassen/v18/new-join-service-used
to
branch/v18
github-actions
bot
requested review from
boxofrad,
nklaassen,
ptgott,
strideynet,
tigrato and
zmb3
|
@timothyb89 - this PR will require admin approval to merge due to its size. Consider breaking it up into a series smaller changes. |
nklaassen
approved these changes
Nov 3, 2025
strideynet
approved these changes
Nov 4, 2025
Contributor
strideynet
left a comment
strideynet
left a comment
There was a problem hiding this comment.
Have we manually tested this backport? If so, can we record that on the PR with what has been tested?
tigrato
approved these changes
Nov 4, 2025
Contributor
Author
Fair call out - I did manually retest it against my Env0 tenant without any trouble. I've added a note to the PR description about this as well. |
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
zmb3
approved these changes
Nov 10, 2025
public-teleport-github-review-bot
bot
removed request for
boxofrad and
ptgott
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
timothyb89
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
Merged
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.
Backport of #60386 for branch/v18
I re-tested the backport against a live Env0 tenant without any trouble. Note that as written this functionality will not be usable without #60293, but will work as expected once merged.
This adds a new
env0join method to support joining from env0 workflows, and especially the embedded tbot in the Terraform provider when running on env0.This is the first OIDC join method on the new join service, and will not support legacy joining. As such, it won't be backported beyond v18.
Closes #53798
changelog: Add new
env0join method to support joining within Env0 workflowsFix imports
Fix failing test
Add env0 token source
Fix missing env0 join method in tbot
Fix env0 validation
This fixes some issues in env0 token validation:
Fix incorrect date in new file copyright header
Fix generated tfschema
Fix failing test after adding the token source
First round of code review
Add example token claims in comment
Move common OIDC handling logic into a separate handler
Specific validation logic is now separate and the validator is passed as an argument to a generic
handleOIDCJoin()handler.Fix imports
Rename joinclient/join_env0.go to join_oidc.go