Skip to content

fix flaky lib/auth cache-enabled tests #36216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GavinFrazar merged 3 commits into from
Jan 3, 2024
Merged

fix flaky lib/auth cache-enabled tests #36216

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
529bdbb
fix flaky lib/auth cache-enabled tests
GavinFrazar Jan 2, 2024
fd89faa
use auth server close context for cache in tests
GavinFrazar Jan 3, 2024
cc7bd08
Merge branch 'master' into gavinfrazar/fix-flaky-tests
GavinFrazar Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/auth/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,12 @@ func NewTestAuthServer(cfg TestAuthServerConfig) (*TestAuthServer, error) {

if cfg.CacheEnabled {
srv.AuthServer.Cache, err = accesspoint.NewAccessCache(accesspoint.AccessCacheConfig{
Context: ctx,
Context: srv.AuthServer.CloseContext(),
Services: srv.AuthServer.Services,
Setup: cache.ForAuth,
CacheName: []string{teleport.ComponentAuth},
Events: true,
Unstarted: true,
})
if err != nil {
return nil, trace.Wrap(err)
Expand Down Expand Up @@ -436,6 +437,13 @@ func NewTestAuthServer(cfg TestAuthServerConfig) (*TestAuthServer, error) {
return nil, trace.Wrap(err)
}

// Auth initialization is done (including creation/updating of all singleton
// configuration resources) so now we can start the cache.
if c, ok := srv.AuthServer.Cache.(*cache.Cache); ok {
if err := c.Start(); err != nil {
Comment thread
GavinFrazar marked this conversation as resolved.
return nil, trace.NewAggregate(err, c.Close())
}
}
return srv, nil
}

Expand Down