Skip to content

[v16] feat: Disable auto-enroll via environment variable#47720

Merged
codingllama merged 2 commits intobranch/v16from
bot/backport-47679-branch/v16
Oct 18, 2024
Merged

[v16] feat: Disable auto-enroll via environment variable#47720
codingllama merged 2 commits intobranch/v16from
bot/backport-47679-branch/v16

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

@codingllama codingllama commented Oct 18, 2024

Backport #47679 and #47723 to branch/v16

changelog: Auto-enroll may be locally disabled using the TELEPORT_DEVICE_AUTO_ENROLL_DISABLED=1 environment variable

@codingllama codingllama disabled auto-merge October 18, 2024 18:43
@codingllama
Copy link
Copy Markdown
Contributor Author

This is flaky! Mailed #47723, will merge it here once it lands.

* Fix TestAutoEnroll_disabledByEnv flakiness

* Use t.Setenv

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

---------

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
@codingllama
Copy link
Copy Markdown
Contributor Author

Cherry-picked #47723 in here. I'll do the same for the other backports and queue them all.

@codingllama codingllama enabled auto-merge October 18, 2024 19:36
@codingllama
Copy link
Copy Markdown
Contributor Author

PTAL @rosstimothy.

@codingllama codingllama added this pull request to the merge queue Oct 18, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 18, 2024
@codingllama codingllama added this pull request to the merge queue Oct 18, 2024
Merged via the queue into branch/v16 with commit 80d660c Oct 18, 2024
@codingllama codingllama deleted the bot/backport-47679-branch/v16 branch October 18, 2024 22:15
This was referenced Oct 22, 2024
@fheinecke fheinecke mentioned this pull request Apr 9, 2025
@fheinecke fheinecke mentioned this pull request Jan 8, 2026
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.

3 participants