Skip to content

[v15] feat: Disable auto-enroll via environment variable#47719

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

[v15] feat: Disable auto-enroll via environment variable#47719
codingllama merged 2 commits intobranch/v15from
bot/backport-47679-branch/v15

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

@codingllama codingllama commented Oct 18, 2024

Backport #47679 and #47723 to branch/v15

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

@codingllama
Copy link
Copy Markdown
Contributor Author

codingllama commented Oct 18, 2024

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

PTAL @rosstimothy @ryanclark.

@codingllama codingllama added this pull request to the merge queue Oct 18, 2024
Merged via the queue into branch/v15 with commit 16616c7 Oct 18, 2024
@codingllama codingllama deleted the bot/backport-47679-branch/v15 branch October 18, 2024 21:51
@doggydogworld doggydogworld mentioned this pull request Oct 22, 2024
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