Skip to content

feat: add resume support to coordinator connections #14234

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
merged 7 commits into from
Aug 20, 2024
Merged

feat: add resume support to coordinator connections #14234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a7a865
feat: add resume support to coordinator connections
deansheather Aug 12, 2024
904fde2
PR comments
deansheather Aug 13, 2024
73a5cee
PR comments 2
deansheather Aug 14, 2024
f49fe6b
Merge branch 'main' into dean/resume-token
deansheather Aug 14, 2024
3db51e0
PR comments 3
deansheather Aug 18, 2024
a81eac1
PR comments 4
deansheather Aug 20, 2024
195fb04
PR comments 5
deansheather Aug 20, 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
Prev Previous commit
PR comments 5
  • Loading branch information
@deansheather
deansheather committed Aug 20, 2024
commit 195fb04146cebf6dc735e56c26e1df31b100a3da
16 changes: 7 additions & 9 deletions codersdk/workspacesdk/connector_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,7 @@ func TestTailnetAPIConnector_ResumeToken(t *testing.T) {

// Fetch first token. We don't need to advance the clock since we use a
// channel with a single item to immediately fetch.
trappedTicker := newTickerTrap.MustWait(ctx)
trappedTicker.Release()
newTickerTrap.MustWait(ctx).Release()
// We call ticker.Reset after each token fetch to apply the refresh duration
// requested by the server.
trappedReset := tickerResetTrap.MustWait(ctx)
Expand All @@ -250,10 +249,10 @@ func TestTailnetAPIConnector_ResumeToken(t *testing.T) {
_ = wsConn.Close(websocket.StatusGoingAway, "test")

// Wait for the resume token to be refreshed.
trappedTicker = newTickerTrap.MustWait(ctx)
trappedTicker := newTickerTrap.MustWait(ctx)
// Advance the clock slightly to ensure the new JWT is different.
clock.Advance(time.Second).MustWait(ctx)
trappedTicker.Release()
waiter = clock.Advance(trappedTicker.Duration)
waiter.MustWait(ctx)
trappedReset = tickerResetTrap.MustWait(ctx)
trappedReset.Release()

Expand Down Expand Up @@ -329,8 +328,7 @@ func TestTailnetAPIConnector_ResumeTokenFailure(t *testing.T) {
uut.runConnector(fConn)

// Wait for the resume token to be fetched for the first time.
trappedTicker := newTickerTrap.MustWait(ctx)
trappedTicker.Release()
newTickerTrap.MustWait(ctx).Release()
trappedReset := tickerResetTrap.MustWait(ctx)
trappedReset.Release()
originalResumeToken := uut.resumeToken.Token
Expand All @@ -343,11 +341,11 @@ func TestTailnetAPIConnector_ResumeTokenFailure(t *testing.T) {

// Wait for the resume token to be refreshed, which indicates a successful
// reconnect.
trappedTicker = newTickerTrap.MustWait(ctx)
trappedTicker.Release()
trappedTicker := newTickerTrap.MustWait(ctx)
// Since we failed the initial reconnect and we're definitely reconnected
// now, the stored resume token should now be nil.
require.Nil(t, uut.resumeToken)
trappedTicker.Release()
trappedReset = tickerResetTrap.MustWait(ctx)
trappedReset.Release()
require.NotNil(t, uut.resumeToken)
Expand Down
4 changes: 1 addition & 3 deletions tailnet/resume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,14 @@ func TestResumeTokenKeyProvider(t *testing.T) {
t.Parallel()

id := uuid.New()
now := time.Now()
clock := quartz.NewMock(t)
_ = clock.Set(now)
provider := tailnet.NewResumeTokenKeyProvider(key, clock, tailnet.DefaultResumeTokenExpiry)
token, err := provider.GenerateResumeToken(id)
require.NoError(t, err)
require.NotNil(t, token)
require.NotEmpty(t, token.Token)
require.Equal(t, tailnet.DefaultResumeTokenExpiry/2, token.RefreshIn.AsDuration())
require.WithinDuration(t, now.Add(tailnet.DefaultResumeTokenExpiry), token.ExpiresAt.AsTime(), time.Second)
require.WithinDuration(t, clock.Now().Add(tailnet.DefaultResumeTokenExpiry), token.ExpiresAt.AsTime(), time.Second)

// Advance time past expiry
_ = clock.Advance(tailnet.DefaultResumeTokenExpiry + time.Second)
Expand Down
Loading