Skip to content

Commit 812f744

Browse files
egorikasegorikas
authored
Fix golangci-lint errors across codebase #10 (#538)
fixing lint errors before activation of golangci-lint
1 parent eb03be3 commit 812f744

File tree

14 files changed

+105
-41
lines changed

14 files changed

+105
-41
lines changed

‎lib/store/ca_store_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ func TestCAStoreCreateUploadFileAndMoveToCache(t *testing.T) {
175175

176176
f, err := s.uploadStore.newFileOp().GetFileReader(src, 0 /* readPartSize */)
177177
require.NoError(err)
178-
defer f.Close()
178+
t.Cleanup(func() {
179+
require.NoError(f.Close())
180+
})
179181
digester := core.NewDigester()
180182
digest, err := digester.FromReader(f)
181183
require.NoError(err)
@@ -206,7 +208,9 @@ func TestCAStoreCreateUploadFileAndMoveToCacheFailure(t *testing.T) {
206208

207209
f, err := s.uploadStore.newFileOp().GetFileReader(src, 0 /* readPartSize */)
208210
require.NoError(err)
209-
defer f.Close()
211+
t.Cleanup(func() {
212+
require.NoError(f.Close())
213+
})
210214
digester := core.NewDigester()
211215
digest, err := digester.FromReader(f)
212216
require.NoError(err)

‎lib/torrent/scheduler/scheduler_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,8 @@ func TestPullInactiveTorrent(t *testing.T) {
383383
// Force announce the scheduler for this torrent to simulate a peer which
384384
// is registered in tracker but does not have the torrent in memory.
385385
ac := announceclient.New(seeder.pctx, hashring.NoopPassiveRing(hostlist.Fixture(mocks.trackerAddr)), nil)
386-
ac.Announce(blob.Digest, blob.MetaInfo.InfoHash(), false, announceclient.V1)
386+
_, _, err := ac.Announce(blob.Digest, blob.MetaInfo.InfoHash(), false, announceclient.V1)
387+
require.NoError(err)
387388

388389
leecher := mocks.newPeer(config)
389390

‎lib/torrent/scheduler/testutils_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ func findFreePort() int {
174174
if err != nil {
175175
panic(err)
176176
}
177-
defer l.Close()
177+
defer func() {
178+
if err := l.Close(); err != nil {
179+
panic(err)
180+
}
181+
}()
178182
_, portStr, err := net.SplitHostPort(l.Addr().String())
179183
if err != nil {
180184
panic(err)

‎origin/blobserver/server.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,17 @@ func (s *Server) ListenAndServe(h http.Handler) error {
178178
}
179179

180180
func (s *Server) healthCheckHandler(w http.ResponseWriter, r *http.Request) error {
181-
fmt.Fprintln(w, "OK")
182-
return nil
181+
_, err := fmt.Fprintln(w, "OK")
182+
return err
183183
}
184184

185185
func (s *Server) readinessCheckHandler(w http.ResponseWriter, r *http.Request) error {
186186
err := s.backends.CheckReadiness()
187187
if err != nil {
188188
return handler.Errorf("not ready to serve traffic: %s", err).Status(http.StatusServiceUnavailable)
189189
}
190-
fmt.Fprintln(w, "OK")
191-
return nil
190+
_, err = fmt.Fprintln(w, "OK")
191+
return err
192192
}
193193

194194
// statHandler returns blob info if it exists.

‎origin/blobserver/server_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ func TestHealth(t *testing.T) {
4848

4949
resp, err := httputil.Get(
5050
fmt.Sprintf("http://%s/health", s.addr))
51-
defer resp.Body.Close()
5251
require.NoError(err)
52+
t.Cleanup(func() {
53+
require.NoError(resp.Body.Close())
54+
})
5355
b, err := io.ReadAll(resp.Body)
5456
require.NoError(err)
5557
require.Equal("OK\n", string(b))

‎utils/configutil/config_test.go‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ func writeFile(t *testing.T, contents string) string {
9090

9191
f, err := os.CreateTemp("", "configtest")
9292
require.NoError(err)
93-
94-
defer f.Close()
93+
t.Cleanup(func() {
94+
require.NoError(f.Close())
95+
})
9596

9697
_, err = f.Write([]byte(contents))
9798
require.NoError(err)
@@ -103,7 +104,9 @@ func TestLoad(t *testing.T) {
103104
require := require.New(t)
104105

105106
fname := writeFile(t, goodConfig)
106-
defer os.Remove(fname)
107+
t.Cleanup(func() {
108+
require.NoError(os.Remove(fname))
109+
})
107110

108111
var cfg configuration
109112
err := Load(fname, &cfg)
@@ -117,11 +120,15 @@ func TestLoadFilesExtends(t *testing.T) {
117120
require := require.New(t)
118121

119122
fname := writeFile(t, goodConfig)
120-
defer os.Remove(fname)
123+
t.Cleanup(func() {
124+
require.NoError(os.Remove(fname))
125+
})
121126

122127
partialConfig := "buffer_space: 8080"
123128
partial := writeFile(t, partialConfig)
124-
defer os.Remove(partial)
129+
t.Cleanup(func() {
130+
require.NoError(os.Remove(partial))
131+
})
125132

126133
var cfg configuration
127134
err := loadFiles(&cfg, []string{fname, partial})
@@ -147,10 +154,14 @@ func TestLoadFilesValidateOnce(t *testing.T) {
147154
`
148155

149156
fname1 := writeFile(t, invalidConfig1)
150-
defer os.Remove(fname1)
157+
t.Cleanup(func() {
158+
require.NoError(os.Remove(fname1))
159+
})
151160

152161
fname2 := writeFile(t, invalidConfig2)
153-
defer os.Remove(invalidConfig2)
162+
t.Cleanup(func() {
163+
require.NoError(os.Remove(fname2))
164+
})
154165

155166
// Either config by itself will not pass validation.
156167
var cfg1 configuration
@@ -204,7 +215,9 @@ func TestInvalidConfig(t *testing.T) {
204215
require := require.New(t)
205216

206217
fname := writeFile(t, invalidConfig)
207-
defer os.Remove(fname)
218+
t.Cleanup(func() {
219+
require.NoError(os.Remove(fname))
220+
})
208221

209222
var cfg configuration
210223
err := Load(fname, &cfg)
@@ -277,16 +290,21 @@ func TestExtendsConfigCircularRef(t *testing.T) {
277290

278291
f1, err := os.CreateTemp("", "configtest")
279292
require.NoError(err)
293+
t.Cleanup(func() {
294+
require.NoError(f1.Close())
295+
})
280296

281297
f2, err := os.CreateTemp("", "configtest")
282298
require.NoError(err)
299+
t.Cleanup(func() {
300+
require.NoError(f2.Close())
301+
})
283302

284303
f3, err := os.CreateTemp("", "configtest")
285304
require.NoError(err)
286-
287-
defer f1.Close()
288-
defer f2.Close()
289-
defer f3.Close()
305+
t.Cleanup(func() {
306+
require.NoError(f3.Close())
307+
})
290308

291309
_, err = f1.Write([]byte(goodConfig))
292310
require.NoError(err)

‎utils/dedup/request_cache_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestRequestCacheStartCleansUpCachedErrors(t *testing.T) {
148148
clk.Add(config.ErrorTTL)
149149
clk.Add(config.CleanupInterval)
150150

151-
d.Start("c", noop)
151+
require.NoError(d.Start("c", noop))
152152

153153
// Start should trigger cleanup.
154154
require.Empty(d.errors)

‎utils/handler/handler.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ func Wrap(h ErrHandler) http.HandlerFunc {
9090
errMsg = e.Error()
9191
}
9292
w.WriteHeader(status)
93-
w.Write([]byte(errMsg))
93+
if _, err := w.Write([]byte(errMsg)); err != nil {
94+
log.Errorf("Failed to write error response: %s", err)
95+
}
9496
} else {
9597
status = http.StatusOK
9698
}

‎utils/httputil/httputil.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525

2626
"github.com/cenkalti/backoff"
2727
"github.com/go-chi/chi"
28-
2928
"github.com/uber/kraken/core"
3029
"github.com/uber/kraken/utils/handler"
30+
"github.com/uber/kraken/utils/log"
3131
)
3232

3333
var retryableCodes = map[int]struct{}{
@@ -51,7 +51,11 @@ type StatusError struct {
5151

5252
// NewStatusError returns a new StatusError.
5353
func NewStatusError(resp *http.Response) StatusError {
54-
defer resp.Body.Close()
54+
defer func() {
55+
if err := resp.Body.Close(); err != nil {
56+
log.Errorf("Failed to close response body: %s", err)
57+
}
58+
}()
5559
respBytes, err := io.ReadAll(resp.Body)
5660
respDump := string(respBytes)
5761
if err != nil {

‎utils/httputil/tls_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,13 @@ func startTLSServer(t *testing.T, clientCAs []Secret) (addr string, serverCA Sec
167167
r := chi.NewRouter()
168168
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
169169
w.WriteHeader(http.StatusOK)
170-
fmt.Fprintln(w, "OK")
170+
_, err := fmt.Fprintln(w, "OK")
171+
require.NoError(err)
172+
})
173+
go http.Serve(l, r) //nolint:errcheck
174+
cleanup.Add(func() {
175+
require.NoError(l.Close())
171176
})
172-
go http.Serve(l, r)
173-
cleanup.Add(func() { l.Close() })
174177
return l.Addr().String(), Secret{certPath}, cleanup.Run
175178
}
176179

@@ -237,7 +240,8 @@ func TestTLSClientFallback(t *testing.T) {
237240
r := chi.NewRouter()
238241
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
239242
w.WriteHeader(http.StatusOK)
240-
fmt.Fprintln(w, "OK")
243+
_, err := fmt.Fprintln(w, "OK")
244+
require.NoError(err)
241245
})
242246
addr, stop := testutil.StartServer(r)
243247
defer stop()

0 commit comments

Comments
 (0)