Skip to content

Commit 09e1ac1

Browse files
authored
Merge pull request #2219 from dgageot/board/upgrade-golangci-lint-enable-more-linter-4541fe11
Enable bodyclose, makezero, and sqlclosecheck linters
2 parents ad4f99b + 980ec50 commit 09e1ac1

6 files changed

Lines changed: 13 additions & 7 deletions

File tree

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ linters:
6363
- usetesting
6464
- whitespace
6565
- wastedassign
66+
- bodyclose
67+
- makezero
68+
- sqlclosecheck
6669
settings:
6770
forbidigo:
6871
forbid:

pkg/audio/transcribe/transcribe_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (t *Transcriber) Start(ctx context.Context, handler TranscriptHandler) erro
6767
t.cancel = cancel
6868

6969
// Connect to OpenAI Realtime API
70-
conn, _, err := websocket.DefaultDialer.DialContext(ctx, openAIRealtimeURL, http.Header{
70+
conn, _, err := websocket.DefaultDialer.DialContext(ctx, openAIRealtimeURL, http.Header{ //nolint:bodyclose // websocket upgrade response
7171
"Authorization": []string{"Bearer " + t.apiKey},
7272
"OpenAI-Beta": []string{"realtime=v1"},
7373
})

pkg/model/provider/oaistream/middleware_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ func TestErrorBodyMiddleware(t *testing.T) {
102102

103103
resp, err := middleware(req, next)
104104
require.NoError(t, err)
105+
defer resp.Body.Close()
105106
assert.Equal(t, http.StatusOK, resp.StatusCode)
106107
})
107108

@@ -121,6 +122,7 @@ func TestErrorBodyMiddleware(t *testing.T) {
121122

122123
resp, err := middleware(req, next)
123124
require.NoError(t, err)
125+
defer resp.Body.Close()
124126
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)
125127

126128
body, err := io.ReadAll(resp.Body)
@@ -144,6 +146,7 @@ func TestErrorBodyMiddleware(t *testing.T) {
144146

145147
resp, err := middleware(req, next)
146148
require.NoError(t, err)
149+
defer resp.Body.Close()
147150
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)
148151

149152
body, err := io.ReadAll(resp.Body)
@@ -167,6 +170,7 @@ func TestErrorBodyMiddleware(t *testing.T) {
167170

168171
resp, err := middleware(req, next)
169172
require.NoError(t, err)
173+
defer resp.Body.Close()
170174
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)
171175

172176
body, err := io.ReadAll(resp.Body)
@@ -191,6 +195,7 @@ func TestErrorBodyMiddleware(t *testing.T) {
191195

192196
resp, err := middleware(req, next)
193197
require.NoError(t, err)
198+
defer resp.Body.Close()
194199

195200
body, err := io.ReadAll(resp.Body)
196201
require.NoError(t, err)

pkg/runtime/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func (c *Client) runAgentWithAgentName(ctx context.Context, sessionID, agent, ag
311311
req.Header.Set("Accept", "text/event-stream")
312312
req.Header.Set("Cache-Control", "no-cache")
313313

314-
resp, err := c.httpClient.Do(req)
314+
resp, err := c.httpClient.Do(req) //nolint:bodyclose // body is closed in the goroutine below
315315
if err != nil {
316316
return nil, fmt.Errorf("performing request: %w", err)
317317
}

pkg/session/store.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,23 +680,21 @@ func (s *SQLiteSessionStore) loadSessionItemsWith(ctx context.Context, q querier
680680
if err != nil {
681681
return nil, err
682682
}
683+
defer rows.Close()
683684

684685
// First, collect all raw row data so we can close the result set
685686
// before making any recursive calls (SQLite doesn't allow concurrent queries)
686687
var rawRows []sessionItemRow
687688
for rows.Next() {
688689
var row sessionItemRow
689690
if err := rows.Scan(&row.position, &row.itemType, &row.agentName, &row.messageJSON, &row.implicit, &row.subsessionID, &row.summaryText); err != nil {
690-
rows.Close()
691691
return nil, err
692692
}
693693
rawRows = append(rawRows, row)
694694
}
695695
if err := rows.Err(); err != nil {
696-
rows.Close()
697696
return nil, err
698697
}
699-
rows.Close()
700698

701699
if len(rawRows) == 0 {
702700
return nil, nil

pkg/tools/builtin/tasks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ func effectiveStatus(task Task, tasks map[string]Task) TaskStatus {
155155

156156
func hasCycle(tasks map[string]Task, startID string, deps []string) bool {
157157
visited := make(map[string]bool)
158-
stack := make([]string, len(deps))
159-
copy(stack, deps)
158+
stack := make([]string, 0, len(deps))
159+
stack = append(stack, deps...)
160160
for len(stack) > 0 {
161161
current := stack[len(stack)-1]
162162
stack = stack[:len(stack)-1]

0 commit comments

Comments
 (0)