[v15] Update Proxy Features #48224
Merged
[v15] Update Proxy Features #48224
Conversation
This file contains 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
* Add feature watcher * Add test * Update godocs, fix typos, rename SupportEntitlementsCompatibility to BackfillFeatures * Godocs; rename start and stop functions * Use `Feature` prefix in var names instead of `License` * Fix lint * Fix TestGetWebConfig_LegacyFeatureLimits * Fix TestGetWebConfig_WithEntitlements * Fix tests and lint * Remove sync.Once * Add jitter * Remove Ping call from getUserContext * Move entitlements test to entitlements package * Apply suggestions from code review: godoc and tests improvement. Co-authored-by: Zac Bergquist <[email protected]> * Improve tests * Shadow `t` in EventuallyWithT closure to avoid mistakes * Improve startFeatureWatcher godoc * Log features on update * Log features on update * Avoid race condition on test * Improve TODO comment Co-authored-by: rosstimothy <[email protected]> * Use handler config context * Start feature watcher in NewHandler * Improve startFeatureWatcher godocs * Add TODO to unexport SetClusterFeatures * Remove featureWatcherReady * Use require in require.EventuallyWithT in cases where an error is not expected * Use return of assert.NoError` to return early on require.EventuallyWithT --------- Co-authored-by: Zac Bergquist <[email protected]> Co-authored-by: rosstimothy <[email protected]>
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
mcbattirola
force-pushed
the
mcbattirola/v15/update-proxy-features
branch
2 times, most recently
from
40a2506 to
2cad841
Compare
mcbattirola
force-pushed
the
mcbattirola/v15/update-proxy-features
branch
from
2cad841 to
cf91623
Compare
mcbattirola
added
backport
no-changelog
mcbattirola
changed the title
github-actions
bot
requested review from
kimlisa,
michellescripts,
rosstimothy and
zmb3
|
Required for https://github.com/gravitational/cloud/issues/9458 |
kimlisa
approved these changes
Nov 1, 2024
rosstimothy
approved these changes
Nov 4, 2024
public-teleport-github-review-bot
bot
removed request for
zmb3 and
michellescripts
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
zmb3
reviewed
Dec 24, 2024
| @@ -339,6 +343,8 @@ func (c *Config) SetDefaults() { | |||
| if c.PresenceChecker == nil { | |||
| c.PresenceChecker = client.RunPresenceTask | |||
| } | |||
|
|
|||
| c.FeatureWatchInterval = cmp.Or(c.FeatureWatchInterval, DefaultFeatureWatchInterval) | |||
There was a problem hiding this comment.
FYI, cmp.Or requires Go 1.22 or later.
We build with Go 1.22, so that's why the build hasn't failed.
We do however set the language level to Go 1.21 in branch/v15, which generates a warning.
module github.com/gravitational/teleport
go 1.21
toolchain go1.22.10
At this point, we might as well just update the go directive to 1.22 here.
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 #45979 to branch/v15
This was manually backported and required some changes:
entitlementspackage on v15, so all calls to its methods and types were removed.getUserContextto useh.GetFeatures(). This is because in v15 this method has some additional logic for compatibility that it uses thePingcall to determine. In the original PR, thePingwas only for fetching features, so it was replaced, but in this PR I didn't touch that code to preserve the current behavior.h.ClusterFeatures, that the original PR made private. This is to prevent the build from breaking when we merge this PR, since Teleport Enterprise uses this method.Teleport.E backport: https://github.com/gravitational/teleport.e/pull/5295
Note that
Entitlementsis a new version ofFeatures. They currently coexist in master for compatibility, so even though a package used in the original PR doesn't exist, it is fine to backport this because the original PR also updated theFeatures.