Skip to content

[v15] Deflake lib/auth.TestRollback #53492

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
espadolini merged 1 commit into from
Mar 27, 2025
Merged

[v15] Deflake lib/auth.TestRollback #53492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions lib/auth/tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ func TestRollback(t *testing.T) {
// create proxy client just for test purposes
proxy, err := testSrv.NewClient(TestBuiltin(types.RoleProxy))
require.NoError(t, err)
defer proxy.Close()

// client works before rotation is initiated
_, err = proxy.GetNodes(ctx, apidefaults.Namespace)
Expand Down Expand Up @@ -710,9 +711,12 @@ func TestRollback(t *testing.T) {
// new clients work
newProxy, err := testSrv.NewClient(TestBuiltin(types.RoleProxy))
require.NoError(t, err)
defer newProxy.Close()

_, err = newProxy.GetNodes(ctx, apidefaults.Namespace)
require.NoError(t, err)
require.EventuallyWithT(t, func(ct *assert.CollectT) {
_, err = testSrv.CloneClient(t, newProxy).GetNodes(ctx, apidefaults.Namespace)
assert.NoError(ct, err)
}, 15*time.Second, 100*time.Millisecond)

// advance rotation:
err = testSrv.Auth().RotateCertAuthority(ctx, types.RotateRequest{
Expand Down Expand Up @@ -756,17 +760,13 @@ func TestRollback(t *testing.T) {
require.NoError(t, err)

// clients with new creds will no longer work as soon as backend modification event propagates.
require.Eventually(t, func() bool {
require.EventuallyWithT(t, func(ct *assert.CollectT) {
_, err := testSrv.CloneClient(t, newProxy).GetNodes(ctx, apidefaults.Namespace)
return err != nil
}, time.Second*15, time.Millisecond*200)
assert.Error(ct, err)
}, time.Second*15, time.Millisecond*100)

grpcClientOld := testSrv.CloneClient(t, proxy)
t.Cleanup(func() {
require.NoError(t, grpcClientOld.Close())
})
// clients with old creds will still work
_, err = grpcClientOld.GetNodes(ctx, apidefaults.Namespace)
_, err = testSrv.CloneClient(t, proxy).GetNodes(ctx, apidefaults.Namespace)
require.NoError(t, err)
}

Expand Down
Loading