Skip to content

Commit 3223bf9

Browse files
ibetitsmikeibetitsmike
committed
fmt & lint
1 parent 1def64a commit 3223bf9

File tree

8 files changed

+112
-106
lines changed

8 files changed

+112
-106
lines changed

‎coderd/agentapi/backedpipe/backed_pipe.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (bp *BackedPipe) reconnectLocked(ctx context.Context) error {
190190

191191
// Close existing connection if any
192192
if bp.conn != nil {
193-
bp.conn.Close()
193+
_ = bp.conn.Close()
194194
bp.conn = nil
195195
}
196196

@@ -211,17 +211,17 @@ func (bp *BackedPipe) reconnectLocked(ctx context.Context) error {
211211

212212
// Validate sequence numbers
213213
if readerSeqNum > writerSeqNum {
214-
conn.Close()
214+
_ = conn.Close()
215215
return xerrors.Errorf("remote sequence number %d exceeds local sequence %d, cannot replay",
216216
readerSeqNum, writerSeqNum)
217217
}
218218

219219
// Validate writer can replay from the requested sequence
220220
if !bp.writer.CanReplayFrom(readerSeqNum) {
221-
conn.Close()
221+
_ = conn.Close()
222222
// Calculate data loss
223-
var currentSeq = bp.writer.SequenceNum()
224-
var dataLoss = currentSeq - DefaultBufferSize - readerSeqNum
223+
currentSeq := bp.writer.SequenceNum()
224+
dataLoss := currentSeq - DefaultBufferSize - readerSeqNum
225225
return xerrors.Errorf("cannot replay from sequence %d (current: %d, data loss: ~%d bytes)",
226226
readerSeqNum, currentSeq, dataLoss)
227227
}
@@ -238,7 +238,7 @@ func (bp *BackedPipe) reconnectLocked(ctx context.Context) error {
238238

239239
err = bp.writer.Reconnect(ctx, readerSeqNum, conn)
240240
if err != nil {
241-
conn.Close()
241+
_ = conn.Close()
242242
return xerrors.Errorf("reconnect writer: %w", err)
243243
}
244244

‎coderd/agentapi/backedpipe/backed_pipe_test.go

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package backedpipe
1+
package backedpipe_test
22

33
import (
44
"bytes"
@@ -10,6 +10,9 @@ import (
1010

1111
"github.com/stretchr/testify/require"
1212
"golang.org/x/xerrors"
13+
14+
"github.com/coder/coder/v2/coderd/agentapi/backedpipe"
15+
"github.com/coder/coder/v2/testutil"
1316
)
1417

1518
// mockConnection implements io.ReadWriteCloser for testing
@@ -59,7 +62,7 @@ func (mc *mockConnection) Close() error {
5962
}
6063

6164
func (mc *mockConnection) WriteString(s string) {
62-
mc.readBuffer.WriteString(s)
65+
_, _ = mc.readBuffer.WriteString(s)
6366
}
6467

6568
func (mc *mockConnection) ReadString() string {
@@ -83,7 +86,7 @@ func (mc *mockConnection) Reset() {
8386
}
8487

8588
// mockReconnectFunc creates a unified reconnect function with all behaviors enabled
86-
func mockReconnectFunc(connections ...*mockConnection) (ReconnectFunc, *int, chan struct{}) {
89+
func mockReconnectFunc(connections ...*mockConnection) (backedpipe.ReconnectFunc, *int, chan struct{}) {
8790
connectionIndex := 0
8891
callCount := 0
8992
signalChan := make(chan struct{}, 1)
@@ -108,11 +111,12 @@ func mockReconnectFunc(connections ...*mockConnection) (ReconnectFunc, *int, cha
108111

109112
// Determine readerSeqNum based on call count
110113
var readerSeqNum uint64
111-
if callCount == 1 {
114+
switch {
115+
case callCount == 1:
112116
readerSeqNum = 0
113-
} else if conn.seqNum != 0 {
117+
case conn.seqNum != 0:
114118
readerSeqNum = conn.seqNum
115-
} else {
119+
default:
116120
readerSeqNum = writerSeqNum
117121
}
118122

@@ -128,7 +132,7 @@ func TestBackedPipe_NewBackedPipe(t *testing.T) {
128132
ctx := context.Background()
129133
reconnectFn, _, _ := mockReconnectFunc(newMockConnection())
130134

131-
bp := NewBackedPipe(ctx, reconnectFn)
135+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
132136
require.NotNil(t, bp)
133137
require.False(t, bp.Connected())
134138
}
@@ -140,7 +144,7 @@ func TestBackedPipe_Connect(t *testing.T) {
140144
conn := newMockConnection()
141145
reconnectFn, callCount, _ := mockReconnectFunc(conn)
142146

143-
bp := NewBackedPipe(ctx, reconnectFn)
147+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
144148

145149
err := bp.Connect(ctx)
146150
require.NoError(t, err)
@@ -155,7 +159,7 @@ func TestBackedPipe_ConnectAlreadyConnected(t *testing.T) {
155159
conn := newMockConnection()
156160
reconnectFn, _, _ := mockReconnectFunc(conn)
157161

158-
bp := NewBackedPipe(ctx, reconnectFn)
162+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
159163

160164
err := bp.Connect(ctx)
161165
require.NoError(t, err)
@@ -173,7 +177,7 @@ func TestBackedPipe_ConnectAfterClose(t *testing.T) {
173177
conn := newMockConnection()
174178
reconnectFn, _, _ := mockReconnectFunc(conn)
175179

176-
bp := NewBackedPipe(ctx, reconnectFn)
180+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
177181

178182
err := bp.Close()
179183
require.NoError(t, err)
@@ -190,7 +194,7 @@ func TestBackedPipe_BasicReadWrite(t *testing.T) {
190194
conn := newMockConnection()
191195
reconnectFn, _, _ := mockReconnectFunc(conn)
192196

193-
bp := NewBackedPipe(ctx, reconnectFn)
197+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
194198

195199
err := bp.Connect(ctx)
196200
require.NoError(t, err)
@@ -218,7 +222,7 @@ func TestBackedPipe_WriteBeforeConnect(t *testing.T) {
218222
conn := newMockConnection()
219223
reconnectFn, _, _ := mockReconnectFunc(conn)
220224

221-
bp := NewBackedPipe(ctx, reconnectFn)
225+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
222226

223227
// Write before connecting should succeed (buffered)
224228
n, err := bp.Write([]byte("hello"))
@@ -239,7 +243,7 @@ func TestBackedPipe_ReadBlocksWhenDisconnected(t *testing.T) {
239243
ctx := context.Background()
240244
reconnectFn, _, _ := mockReconnectFunc(newMockConnection())
241245

242-
bp := NewBackedPipe(ctx, reconnectFn)
246+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
243247

244248
// Start a read that should block
245249
readDone := make(chan struct{})
@@ -282,7 +286,7 @@ func TestBackedPipe_Reconnection(t *testing.T) {
282286
conn2.seqNum = 17 // Remote has received 17 bytes, so replay from sequence 17
283287
reconnectFn, _, signalChan := mockReconnectFunc(conn1, conn2)
284288

285-
bp := NewBackedPipe(ctx, reconnectFn)
289+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
286290

287291
// Initial connect
288292
err := bp.Connect(ctx)
@@ -322,7 +326,7 @@ func TestBackedPipe_Close(t *testing.T) {
322326
conn := newMockConnection()
323327
reconnectFn, _, _ := mockReconnectFunc(conn)
324328

325-
bp := NewBackedPipe(ctx, reconnectFn)
329+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
326330

327331
err := bp.Connect(ctx)
328332
require.NoError(t, err)
@@ -346,7 +350,7 @@ func TestBackedPipe_CloseIdempotent(t *testing.T) {
346350
conn := newMockConnection()
347351
reconnectFn, _, _ := mockReconnectFunc(conn)
348352

349-
bp := NewBackedPipe(ctx, reconnectFn)
353+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
350354

351355
err := bp.Close()
352356
require.NoError(t, err)
@@ -363,10 +367,10 @@ func TestBackedPipe_WaitForConnection(t *testing.T) {
363367
conn := newMockConnection()
364368
reconnectFn, _, _ := mockReconnectFunc(conn)
365369

366-
bp := NewBackedPipe(ctx, reconnectFn)
370+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
367371

368372
// Should timeout when not connected
369-
timeoutCtx, cancel := context.WithTimeout(ctx, 10*time.Millisecond)
373+
timeoutCtx, cancel := context.WithTimeout(ctx, testutil.WaitShort)
370374
defer cancel()
371375

372376
err := bp.WaitForConnection(timeoutCtx)
@@ -390,7 +394,7 @@ func TestBackedPipe_ConcurrentReadWrite(t *testing.T) {
390394
conn := newMockConnection()
391395
reconnectFn, _, _ := mockReconnectFunc(conn)
392396

393-
bp := NewBackedPipe(ctx, reconnectFn)
397+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
394398

395399
err := bp.Connect(ctx)
396400
require.NoError(t, err)
@@ -478,7 +482,7 @@ func TestBackedPipe_ReconnectFunctionFailure(t *testing.T) {
478482
return nil, 0, xerrors.New("reconnect failed")
479483
}
480484

481-
bp := NewBackedPipe(ctx, failingReconnectFn)
485+
bp := backedpipe.NewBackedPipe(ctx, failingReconnectFn)
482486

483487
err := bp.Connect(ctx)
484488
require.Error(t, err)
@@ -494,7 +498,7 @@ func TestBackedPipe_ForceReconnect(t *testing.T) {
494498
conn2 := newMockConnection()
495499
reconnectFn, callCount, _ := mockReconnectFunc(conn1, conn2)
496500

497-
bp := NewBackedPipe(ctx, reconnectFn)
501+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
498502

499503
// Initial connect
500504
err := bp.Connect(ctx)
@@ -538,7 +542,7 @@ func TestBackedPipe_ForceReconnectWhenClosed(t *testing.T) {
538542
conn := newMockConnection()
539543
reconnectFn, _, _ := mockReconnectFunc(conn)
540544

541-
bp := NewBackedPipe(ctx, reconnectFn)
545+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
542546

543547
// Close the pipe first
544548
err := bp.Close()
@@ -557,7 +561,7 @@ func TestBackedPipe_ForceReconnectWhenDisconnected(t *testing.T) {
557561
conn := newMockConnection()
558562
reconnectFn, callCount, _ := mockReconnectFunc(conn)
559563

560-
bp := NewBackedPipe(ctx, reconnectFn)
564+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
561565

562566
// Don't connect initially, just force reconnect
563567
err := bp.ForceReconnect(ctx)
@@ -583,7 +587,7 @@ func BenchmarkBackedPipe_Write(b *testing.B) {
583587
conn := newMockConnection()
584588
reconnectFn, _, _ := mockReconnectFunc(conn)
585589

586-
bp := NewBackedPipe(ctx, reconnectFn)
590+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
587591
bp.Connect(ctx)
588592

589593
data := make([]byte, 1024) // 1KB writes
@@ -599,7 +603,7 @@ func BenchmarkBackedPipe_Read(b *testing.B) {
599603
conn := newMockConnection()
600604
reconnectFn, _, _ := mockReconnectFunc(conn)
601605

602-
bp := NewBackedPipe(ctx, reconnectFn)
606+
bp := backedpipe.NewBackedPipe(ctx, reconnectFn)
603607
bp.Connect(ctx)
604608

605609
// Fill connection with data

‎coderd/agentapi/backedpipe/backed_reader.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,15 @@ func (br *BackedReader) Read(p []byte) (int, error) {
6767
return n, nil // Return data first, EOF on next read
6868
}
6969
return 0, io.EOF
70-
} else {
71-
// Connection failed, disconnect and return error
72-
br.reader = nil
73-
if n > 0 {
74-
return n, nil // Return data first, error on next read
75-
}
76-
return 0, err // Return non-EOF errors immediately
7770
}
78-
} else {
79-
return n, nil
71+
// Connection failed, disconnect and return error
72+
br.reader = nil
73+
if n > 0 {
74+
return n, nil // Return data first, error on next read
75+
}
76+
return 0, err // Return non-EOF errors immediately
8077
}
78+
return n, nil
8179
}
8280

8381
// Wait for reconnection or close

0 commit comments

Comments
 (0)