opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace httpapi.Heartbeat with httpapi.HeartbeatClose (#21676)

Browse Source 
Relates to https://github.com/coder/coder/pull/21676

* Replaces all existing usages of `httpapi.Heartbeat` with `httpapi.HeartbeatClose`
* Removes `httpapi.HeartbeatClose`
This commit is contained in:
Cian Johnston
2026-01-26 12:11:40 +00:00
committed by GitHub
parent 49f135bcd4
commit 612aae2523
8 changed files with 96 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/httpapi/httpapi_test.go
+7 -6
View File
@@ -18,6 +18,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/xerrors"
"cdr.dev/slog/v3/sloggers/slogtest"
"github.com/coder/coder/v2/coderd/httpapi"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/testutil"
@@ -262,7 +263,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
req.Proto = p.proto
writer := newOneWayWriter(t)
_, _, err := httpapi.OneWayWebSocketEventSender(writer, req)
_, _, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.ErrorContains(t, err, p.proto)
}
})
@@ -273,7 +274,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitShort)
req := newBaseRequest(ctx)
writer := newOneWayWriter(t)
send, _, err := httpapi.OneWayWebSocketEventSender(writer, req)
send, _, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.NoError(t, err)
serverPayload := codersdk.ServerSentEvent{
@@ -299,7 +300,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
ctx, cancel := context.WithCancel(testutil.Context(t, testutil.WaitShort))
req := newBaseRequest(ctx)
writer := newOneWayWriter(t)
_, done, err := httpapi.OneWayWebSocketEventSender(writer, req)
_, done, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.NoError(t, err)
successC := make(chan bool)
@@ -323,7 +324,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitShort)
req := newBaseRequest(ctx)
writer := newOneWayWriter(t)
_, done, err := httpapi.OneWayWebSocketEventSender(writer, req)
_, done, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.NoError(t, err)
successC := make(chan bool)
@@ -353,7 +354,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
ctx, cancel := context.WithCancel(testutil.Context(t, testutil.WaitShort))
req := newBaseRequest(ctx)
writer := newOneWayWriter(t)
send, done, err := httpapi.OneWayWebSocketEventSender(writer, req)
send, done, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.NoError(t, err)
successC := make(chan bool)
@@ -394,7 +395,7 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
ctx := testutil.Context(t, timeout)
req := newBaseRequest(ctx)
writer := newOneWayWriter(t)
_, _, err := httpapi.OneWayWebSocketEventSender(writer, req)
_, _, err := httpapi.OneWayWebSocketEventSender(slogtest.Make(t, nil))(writer, req)
require.NoError(t, err)
type Result struct {