Skip to content

Commit 4a19ae9

Browse files
CDRaynCDRayn
committed
Fix linter warnings
1 parent 34c3f4f commit 4a19ae9

File tree

6 files changed

+101
-24
lines changed

6 files changed

+101
-24
lines changed

‎pkg/rsstorage/internal/chunks.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ func (w *DefaultChunkUtils) WriteChunked(
6868
pR, pW := io.Pipe()
6969

7070
// Clean up on error
71-
defer func(err error) {
71+
defer func() {
7272
if err != nil {
7373
removeErr := w.Server.Remove(ctx, dir, address)
7474
if removeErr != nil {
7575
err = errors.Join(err, removeErr)
7676
}
7777
}
78-
}(err)
78+
}()
7979

8080
// Write all chunks
8181
results := make(chan uint64)

‎pkg/rsstorage/servers/file/server_test.go‎

Lines changed: 81 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -627,21 +627,38 @@ func (s *FileStorageServerSuite) TestRemove(c *check.C) {
627627
func (s *FileStorageServerSuite) TestUsage(c *check.C) {
628628
tempdir, err := os.MkdirTemp("", "")
629629
c.Assert(err, check.IsNil)
630-
defer os.RemoveAll(tempdir)
630+
defer func(path string) {
631+
removeErr := os.RemoveAll(path)
632+
if removeErr != nil {
633+
c.Logf("unbale to remove temp directory: %s", removeErr.Error())
634+
}
635+
}(tempdir)
631636

632637
fileContents1 := make([]byte, int64(10*datasize.KB))
633-
rand.Read(fileContents1)
638+
_, readErr := rand.Read(fileContents1)
639+
c.Assert(readErr, check.IsNil)
634640
fileContents2 := make([]byte, int64(20*datasize.KB))
635-
rand.Read(fileContents2)
641+
_, readErr = rand.Read(fileContents2)
642+
c.Assert(readErr, check.IsNil)
636643
fileContents3 := make([]byte, int64(30*datasize.KB))
637-
rand.Read(fileContents3)
644+
_, readErr = rand.Read(fileContents3)
645+
c.Assert(readErr, check.IsNil)
638646
fileContents4 := make([]byte, int64(5*datasize.KB))
639-
rand.Read(fileContents4)
647+
_, readErr = rand.Read(fileContents4)
648+
c.Assert(readErr, check.IsNil)
640649
fileContents5 := make([]byte, int64(15*datasize.KB))
641-
rand.Read(fileContents5)
650+
_, readErr = rand.Read(fileContents5)
651+
c.Assert(readErr, check.IsNil)
642652
dir1, err := os.MkdirTemp(tempdir, "dutest")
653+
c.Assert(err, check.IsNil)
643654
dir2, err := os.MkdirTemp(dir1, "another")
644-
defer os.RemoveAll(dir1)
655+
c.Assert(err, check.IsNil)
656+
defer func(path string) {
657+
removeErr := os.RemoveAll(path)
658+
if removeErr != nil {
659+
c.Logf("unable to remove test directory: %s", removeErr.Error())
660+
}
661+
}(dir1)
645662
c.Assert(err, check.IsNil)
646663
err = os.WriteFile(filepath.Join(tempdir, "test1"), fileContents1, 0644)
647664
c.Assert(err, check.IsNil)
@@ -668,21 +685,38 @@ func (s *FileStorageServerSuite) TestUsage(c *check.C) {
668685
func (s *FileStorageServerSuite) TestUsageTimeout(c *check.C) {
669686
tempdir, err := os.MkdirTemp("", "")
670687
c.Assert(err, check.IsNil)
671-
defer os.RemoveAll(tempdir)
688+
defer func(path string) {
689+
removeErr := os.RemoveAll(path)
690+
if removeErr != nil {
691+
c.Logf("unable to remove temp directory")
692+
}
693+
}(tempdir)
672694

673695
fileContents1 := make([]byte, int64(10*datasize.KB))
674-
rand.Read(fileContents1)
696+
_, readErr := rand.Read(fileContents1)
697+
c.Assert(readErr, check.IsNil)
675698
fileContents2 := make([]byte, int64(20*datasize.KB))
676-
rand.Read(fileContents2)
699+
_, readErr = rand.Read(fileContents2)
700+
c.Assert(readErr, check.IsNil)
677701
fileContents3 := make([]byte, int64(30*datasize.KB))
678-
rand.Read(fileContents3)
702+
_, readErr = rand.Read(fileContents3)
703+
c.Assert(readErr, check.IsNil)
679704
fileContents4 := make([]byte, int64(5*datasize.KB))
680-
rand.Read(fileContents4)
705+
_, readErr = rand.Read(fileContents4)
706+
c.Assert(readErr, check.IsNil)
681707
fileContents5 := make([]byte, int64(15*datasize.KB))
682-
rand.Read(fileContents5)
708+
_, readErr = rand.Read(fileContents5)
709+
c.Assert(readErr, check.IsNil)
683710
dir1, err := os.MkdirTemp(tempdir, "dutest")
711+
c.Assert(err, check.IsNil)
684712
dir2, err := os.MkdirTemp(dir1, "another")
685-
defer os.RemoveAll(dir1)
713+
c.Assert(err, check.IsNil)
714+
defer func(path string) {
715+
removeErr := os.RemoveAll(path)
716+
if removeErr != nil {
717+
c.Logf("unable to remove test directory: %s", removeErr.Error())
718+
}
719+
}(dir1)
686720
c.Assert(err, check.IsNil)
687721
err = os.WriteFile(filepath.Join(tempdir, "test1"), fileContents1, 0644)
688722
c.Assert(err, check.IsNil)
@@ -713,10 +747,16 @@ func (s *FileStorageServerSuite) TestDiskUsage(c *check.C) {
713747

714748
for i := 0; i < testFiles; i++ {
715749
f, _ := os.CreateTemp("testdata", "*")
716-
f.Write(testStr)
750+
_, writeErr := f.Write(testStr)
751+
c.Assert(writeErr, check.IsNil)
717752
expectedSize += len(testStr)
718753

719-
defer os.Remove(f.Name())
754+
defer func(name string) {
755+
removeErr := os.Remove(name)
756+
if removeErr != nil {
757+
c.Logf("unable to remove test file: %s", removeErr)
758+
}
759+
}(f.Name())
720760
}
721761

722762
sz, err := diskUsage("testdata", time.Minute, time.Second)
@@ -732,10 +772,16 @@ func (s *FileStorageServerSuite) TestDiskUsageCacheTimeout(c *check.C) {
732772

733773
for i := 0; i < testFiles; i++ {
734774
f, _ := os.CreateTemp("testdata", "*")
735-
f.Write(testStr)
775+
_, writeErr := f.Write(testStr)
776+
c.Assert(writeErr, check.IsNil)
736777
expectedSize += len(testStr)
737778

738-
defer os.Remove(f.Name())
779+
defer func(name string) {
780+
removeErr := os.Remove(name)
781+
if removeErr != nil {
782+
c.Logf("unable to remove test file: %s", removeErr.Error())
783+
}
784+
}(f.Name())
739785
}
740786

741787
_, err := diskUsage("testdata", time.Nanosecond, time.Minute)
@@ -750,10 +796,16 @@ func (s *FileStorageServerSuite) TestDiskUsageWalkTimeout(c *check.C) {
750796

751797
for i := 0; i < testFiles; i++ {
752798
f, _ := os.CreateTemp("testdata", "*")
753-
f.Write(testStr)
799+
_, writeErr := f.Write(testStr)
800+
c.Assert(writeErr, check.IsNil)
754801
expectedSize += len(testStr)
755802

756-
defer os.Remove(f.Name())
803+
defer func(name string) {
804+
err := os.Remove(name)
805+
if err != nil {
806+
c.Logf("unable to remove test file: %s", err.Error())
807+
}
808+
}(f.Name())
757809
}
758810

759811
_, err := diskUsage("testdata", time.Minute, time.Nanosecond)
@@ -860,10 +912,16 @@ func (s *FileEnumerationSuite) TestEnumerateWalkTimeout(c *check.C) {
860912

861913
for i := 0; i < testFiles; i++ {
862914
f, _ := os.CreateTemp("testdata", "*")
863-
f.Write(testStr)
915+
_, writeErr := f.Write(testStr)
916+
c.Assert(writeErr, check.IsNil)
864917
expectedSize += len(testStr)
865918

866-
defer os.Remove(f.Name())
919+
defer func(name string) {
920+
err := os.Remove(name)
921+
if err != nil {
922+
c.Logf("unable to remove test file: %s", err.Error())
923+
}
924+
}(f.Name())
867925
}
868926

869927
_, err := enumerate("testdata", time.Nanosecond)
@@ -1169,6 +1227,7 @@ func (s *FileCopyMoveSuite) TestMoveReal(c *check.C) {
11691227

11701228
// Read one chunk
11711229
f, _, _, _, _, err := serverDest.Get(ctx, "dir", "CHUNK")
1230+
c.Assert(err, check.IsNil)
11721231
b, err := io.ReadAll(f)
11731232
c.Assert(err, check.IsNil)
11741233
c.Assert(string(b), check.Equals, servertest.TestDESC)

‎pkg/rsstorage/servers/postgres/server_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,11 @@ func (s *PgCacheServerSuite) TestMove(c *check.C) {
634634
c.Check(err, check.IsNil)
635635
c.Check(ok, check.Equals, false)
636636
c.Check(r, check.IsNil)
637+
c.Check(sz, check.Equals, int64(0))
637638

638639
// Make sure we cannot get old item
639640
r, _, sz, _, ok, err = sourceServer.Get(ctx, "dir", "CHUNKED")
641+
c.Check(sz, check.Equals, int64(0))
640642
c.Check(err, check.IsNil)
641643
c.Check(ok, check.Equals, false)
642644
c.Check(r, check.IsNil)

‎pkg/rsstorage/servers/s3server/s3_enumeration_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func (s *MetaTestSuite) TestBucketDirs(c *check.C) {
4949
ctx := context.Background()
5050
dirs, err := awsOps.BucketDirs(ctx, "no-sync", "bin/")
5151
c.Assert(err, check.NotNil)
52+
c.Assert(dirs, check.IsNil)
5253
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
5354

5455
dirs, err = awsOps.BucketDirs(ctx, "sync", "bin/")
@@ -95,6 +96,7 @@ func (s *MetaTestSuite) TestBucketObjects(c *check.C) {
9596
files, err := awsOps.BucketObjects(ctx, "no-sync", "bin/3.5-xenial", 1, false, BinaryReg)
9697
c.Assert(err, check.NotNil)
9798
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
99+
c.Assert(files, check.IsNil)
98100

99101
files, err = awsOps.BucketObjects(ctx, "sync", "bin/3.5-xenial", 1, false, BinaryReg)
100102
c.Assert(err, check.IsNil)
@@ -144,6 +146,7 @@ func (s *MetaTestSuite) TestBucketObjectsMap(c *check.C) {
144146
files, err := awsOps.BucketObjectsETagMap(ctx, "no-sync", "bin/3.5-xenial", 1, false, BinaryReg)
145147
c.Assert(err, check.NotNil)
146148
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
149+
c.Assert(files, check.IsNil)
147150

148151
files, err = awsOps.BucketObjectsETagMap(ctx, "sync", "bin/3.5-xenial", 1, false, BinaryReg)
149152
c.Assert(err, check.IsNil)

‎pkg/rsstorage/servers/s3server/s3_service_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ func (s *S3WrapperSuite) TestListObjects(c *check.C) {
230230
files, err := wrapper.ListObjects(ctx, &s3.ListObjectsV2Input{Bucket: &bucket, Prefix: &prefix})
231231
c.Assert(err, check.NotNil)
232232
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
233+
c.Assert(files, check.IsNil)
233234

234235
bucket = "sync"
235236
files, err = wrapper.ListObjects(ctx, &s3.ListObjectsV2Input{Bucket: &bucket, Prefix: &prefix})

‎pkg/rsstorage/servers/s3server/server_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
235235
c.Assert(chunked, check.IsNil)
236236
c.Assert(sz, check.DeepEquals, int64(0))
237237
c.Assert(ok, check.Equals, false)
238+
c.Assert(mod, check.Equals, time.Time{})
238239

239240
// Missing
240241
svc.headErr = &types.NoSuchKey{}
@@ -243,6 +244,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
243244
c.Assert(chunked, check.IsNil)
244245
c.Assert(sz, check.DeepEquals, int64(0))
245246
c.Assert(ok, check.Equals, false)
247+
c.Assert(mod, check.Equals, time.Time{})
246248

247249
// Chunked - error in HeadObject
248250
svc.headErr = nil
@@ -253,6 +255,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
253255
},
254256
}
255257
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
258+
c.Assert(mod, check.Equals, time.Time{})
256259
c.Assert(err, check.ErrorMatches, "info.json head error")
257260
c.Assert(chunked, check.IsNil)
258261
c.Assert(sz, check.DeepEquals, int64(0))
@@ -275,6 +278,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
275278
c.Assert(chunked, check.IsNil)
276279
c.Assert(sz, check.DeepEquals, int64(0))
277280
c.Assert(ok, check.Equals, false)
281+
c.Assert(mod, check.Equals, time.Time{})
278282

279283
// Chunked - error decoding info.json
280284
output := &testReadCloser{bytes.NewBufferString("bad[{")}
@@ -290,9 +294,11 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
290294
c.Assert(chunked, check.IsNil)
291295
c.Assert(sz, check.DeepEquals, int64(0))
292296
c.Assert(ok, check.Equals, false)
297+
c.Assert(mod, check.Equals, time.Time{})
293298

294299
// Chunked - ok
295300
nowbytes, err := now.MarshalJSON()
301+
c.Assert(err, check.IsNil)
296302
info := []byte(fmt.Sprintf(`{"chunk_size":64,"file_size":3232,"num_chunks":15,"complete":true,"mod_time":%s}`, string(nowbytes)))
297303
output = &testReadCloser{bytes.NewBuffer(info)}
298304
svc.getMap = map[string]GetResponse{
@@ -307,6 +313,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
307313
c.Assert(chunked, check.NotNil)
308314
c.Assert(sz, check.DeepEquals, int64(3232))
309315
c.Assert(ok, check.Equals, true)
316+
c.Assert(mod, check.Not(check.Equals), time.Time{})
310317
}
311318

312319
func (s *S3StorageServerSuite) TestGet(c *check.C) {
@@ -342,6 +349,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
342349
c.Assert(rs, check.IsNil)
343350
c.Assert(sz, check.DeepEquals, int64(0))
344351
c.Assert(ok, check.Equals, false)
352+
c.Assert(mod, check.Equals, time.Time{})
345353

346354
// Missing
347355
svc.getErr = &types.NoSuchKey{}
@@ -351,6 +359,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
351359
c.Assert(rs, check.IsNil)
352360
c.Assert(sz, check.DeepEquals, int64(0))
353361
c.Assert(ok, check.Equals, false)
362+
c.Assert(mod, check.Equals, time.Time{})
354363

355364
// Chunked - error in HeadObject
356365
svc.headErr = nil
@@ -365,6 +374,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
365374
c.Assert(rs, check.IsNil)
366375
c.Assert(sz, check.DeepEquals, int64(0))
367376
c.Assert(ok, check.Equals, false)
377+
c.Assert(mod, check.Equals, time.Time{})
368378

369379
// Chunked - error reading chunks
370380
svc.headMap = map[string]HeadResponse{
@@ -387,6 +397,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
387397
c.Assert(rs, check.IsNil)
388398
c.Assert(sz, check.Equals, int64(0))
389399
c.Assert(ok, check.Equals, false)
400+
c.Assert(mod, check.Equals, time.Time{})
390401

391402
// Chunked - ok
392403
chunker.ReadErr = nil
@@ -543,6 +554,7 @@ func (s *S3StorageServerSuite) TestRemove(c *check.C) {
543554
}
544555
now := time.Now()
545556
nowbytes, err := now.MarshalJSON()
557+
c.Assert(err, check.IsNil)
546558
info := []byte(fmt.Sprintf(`{"chunk_size":64,"file_size":3232,"num_chunks":15,"complete":true,"mod_time":%s}`, string(nowbytes)))
547559
output := &testReadCloser{bytes.NewBuffer(info)}
548560
svc.getMap = map[string]GetResponse{

0 commit comments

Comments
 (0)