Org-wide linter #2943

End-rey · 2024-09-19T17:06:21Z

Closes #2940.

Signed-off-by: Andrey Butusov <[email protected]>

Error: `Non-wrapping format verb for fmt.Errorf. Use `%w` to format errors` and `comparing with != || == will fail on wrapped errors. Use errors.Is to check for a specific error`. Signed-off-by: Andrey Butusov <[email protected]>

Error: `Error return value is not checked`. Signed-off-by: Andrey Butusov <[email protected]>

Error: `for loop can be changed to use an integer range (Go 1.22+)`. Signed-off-by: Andrey Butusov <[email protected]>

Errors: `unnecessary leading newline` and `unnecessary trailing newline`. Signed-off-by: Andrey Butusov <[email protected]>

Signed-off-by: Andrey Butusov <[email protected]>

Error: `SA4004: the surrounding loop is unconditionally terminated`. Signed-off-by: Andrey Butusov <[email protected]>

Error in `cmd/neofs-node/config.go`: `Function `Reload->Init->init->listenEvents` should pass the context parameter`. Signed-off-by: Andrey Butusov <[email protected]>

Error: `Comment should end in a period`. Signed-off-by: Andrey Butusov <[email protected]>

Signed-off-by: Andrey Butusov <[email protected]>

Error: `duplicated-imports`. Signed-off-by: Andrey Butusov <[email protected]>

Errors: `S1023: redundant `return` statement` and `S1019: should use make(chan *Move) instead`. Signed-off-by: Andrey Butusov <[email protected]>

Use: - `eacl.Target.RawSubjects` instead of `eacl.Target.BinaryKeys` - `eacl.NewTargetByRole` with `eacl.Target.SetRawSubjects` for targets with public keys - `eacl.ConstructTable` instead of `eacl.NewTable` - `eacl.ConstructRecord` instead of `eacl.NewRecord` - `object.Object.GetID` instead of `object.Object.ID` - `object.Object.GetContainerID` instead of `object.Object.ContainerID` - comparing with == instead of `ID.Equals` - `cid.NewFromMarshalledContainer(cnr.Marshal())` instead of `cid.ID .CalculateID` - `user.NewFromECDSAPublicKey` instead of `user.ResolveFromECDSAPublicKey` - direct copy instead of `ID.Encode` - direct assign instead of `ID.SetSHA256` Signed-off-by: Andrey Butusov <[email protected]>

Error: `struct literal uses unkeyed fields`. Signed-off-by: Andrey Butusov <[email protected]>

Signed-off-by: Andrey Butusov <[email protected]>

Update to `math/rand/v2` and use `crypto/rand` for `rand.Read`. Signed-off-by: Andrey Butusov <[email protected]>

Signed-off-by: Andrey Butusov <[email protected]>

Closes #2940. Signed-off-by: Andrey Butusov <[email protected]>

codecov · 2024-09-19T17:09:18Z

Codecov Report

Attention: Patch coverage is 10.00000% with 36 lines in your changes missing coverage. Please review.

Project coverage is 23.91%. Comparing base (4f22042) to head (7468c36).

Files with missing lines	Patch %	Lines
pkg/local_object_storage/engine/tree.go	0.00%	8 Missing ⚠️
cmd/neofs-cli/modules/util/acl.go	0.00%	7 Missing ⚠️
...d/neofs-adm/internal/modules/morph/local_client.go	0.00%	5 Missing ⚠️
cmd/neofs-adm/internal/modules/morph/notary.go	0.00%	4 Missing ⚠️
...ct_storage/blobstor/fstree/fstree_write_generic.go	0.00%	4 Missing ⚠️
...ofs-adm/internal/modules/morph/verified_domains.go	0.00%	3 Missing ⚠️
pkg/innerring/internal/blockchain/blockchain.go	0.00%	2 Missing ⚠️
pkg/core/object/replicate.go	0.00%	1 Missing ⚠️
pkg/morph/client/netmap/config.go	0.00%	1 Missing ⚠️
pkg/services/tree/signature.go	75.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2943      +/-   ##
==========================================
- Coverage   23.91%   23.91%   -0.01%     
==========================================
  Files         776      776              
  Lines       45721    45722       +1     
==========================================
- Hits        10936    10934       -2     
- Misses      33925    33927       +2     
- Partials      860      861       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

roman-khimov · 2024-09-19T18:51:25Z

pkg/local_object_storage/blobstor/fstree/fstree_write_generic.go

@@ -60,7 +60,7 @@ func (w *genericWriter) writeData(_ oid.ID, p string, data []byte) error {
 	for i := range retryCount {
 		tmpPath := p + "#" + strconv.FormatUint(uint64(i), 10)
 		err := w.writeAndRename(tmpPath, p, data)
-		if err != syscall.EEXIST || i == retryCount-1 {
+		if errors.Is(err, syscall.EEXIST) || i == retryCount-1 {


roman-khimov · 2024-09-19T18:53:53Z

pkg/local_object_storage/shard/metrics_test.go

@@ -74,9 +74,9 @@ func TestCounters(t *testing.T) {
 	dir := t.TempDir()
 	sh, mm := shardWithMetrics(t, dir)

-	sh.SetMode(mode.ReadOnly)
+	_ = sh.SetMode(mode.ReadOnly)


Can be checked with require.NoError()

roman-khimov · 2024-09-19T18:54:44Z

cmd/neofs-adm/internal/modules/config/config_test.go

 		key := "credentials." + glagolitsa.LetterByIndex(i)
 		require.Equal(t, "password", v.GetString(key))
 	}

-	key := "credentials." + glagolitsa.LetterByIndex(i)
+	key := "credentials." + glagolitsa.LetterByIndex(i+1)


Maybe use n here?

roman-khimov · 2024-09-19T18:56:58Z

pkg/local_object_storage/metabase/delete_test.go

@@ -60,11 +60,11 @@ func TestDB_Delete(t *testing.T) {

 	// check if they marked as already removed

-	ok, err := metaExists(db, object.AddressOf(child))
+	ok, _ := metaExists(db, object.AddressOf(child))


Wow. It looks like a test bug in fact.

Here, I added err to require.Error and everything all right.

neofs-node/pkg/local_object_storage/metabase/delete_test.go

Lines 63 to 65 in b135a0e

ok, err := metaExists(db, object.AddressOf(child))

require.Error(t, apistatus.ObjectAlreadyRemoved{})

require.False(t, ok)

But there is err == nil and ok is false, i think it is wrong.

neofs-node/pkg/local_object_storage/metabase/delete_test.go

Lines 67 to 69 in b135a0e

ok, err = metaExists(db, object.AddressOf(parent))

require.Error(t, apistatus.ObjectAlreadyRemoved{})

require.False(t, ok)

roman-khimov · 2024-09-19T18:57:23Z

pkg/local_object_storage/metabase/exists_test.go

@@ -179,7 +179,7 @@ func TestDB_Exists(t *testing.T) {
 			require.False(t, gotObj)
 			require.ErrorIs(t, err, meta.ErrObjectIsExpired)

-			gotObj, err = metaExists(db, object.AddressOf(nonExp))
+			gotObj, _ = metaExists(db, object.AddressOf(nonExp))


This better be checked for nil.

roman-khimov · 2024-09-19T18:57:49Z

pkg/local_object_storage/pilorama/forest_test.go

@@ -224,7 +224,7 @@ func testForestTreeDrop(t *testing.T, s Forest) {
 			require.NoError(t, err)
 		}
 	}
-	list, err := s.TreeList(cid)
+	list, _ := s.TreeList(cid)


require.NoError(t, err)?

roman-khimov · 2024-09-19T18:58:41Z

pkg/local_object_storage/shard/shutdown_test.go

@@ -20,9 +20,9 @@ func TestWriteCacheObjectLoss(t *testing.T) {

 	objects := make([]*objectSDK.Object, objCount)
 	for i := range objects {
-		size := smallSize
+		size := smallSize / 2
 		// if i%2 == 0 {


Drop commented out code? Why is it here?

roman-khimov · 2024-09-19T18:59:33Z

pkg/services/control/service_test.go

@@ -101,6 +101,7 @@ func equalListShardResponseBodies(b1, b2 *control.ListShardsResponse_Body) bool

 	return true
 }
+


Whitespace change.

roman-khimov · 2024-09-19T19:01:41Z

pkg/local_object_storage/pilorama/forest_test.go

@@ -684,7 +685,7 @@ func prepareRandomTree(nodeCount, opCount int) []Move {
 			Child: uint64(i) + 1,
 		}
 		//nolint:staticcheck


Drop these comments then?

End-rey added 18 commits September 19, 2024 20:05

workflows: reuse org-wide linter workflow

b4f8062

Signed-off-by: Andrey Butusov <[email protected]>

*: fix errorlint lint errors

6a4d903

Error: `Non-wrapping format verb for fmt.Errorf. Use `%w` to format errors` and `comparing with != || == will fail on wrapped errors. Use errors.Is to check for a specific error`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix errcheck lint errors

b87f9dd

Error: `Error return value is not checked`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix intrange lint errors

297e544

Error: `for loop can be changed to use an integer range (Go 1.22+)`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix whitespace lint errors

0ddfb96

Errors: `unnecessary leading newline` and `unnecessary trailing newline`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix unused and ineffassign lint errors

d98abd2

Signed-off-by: Andrey Butusov <[email protected]>

*: fix staticcheck lint error

7eec572

Error: `SA4004: the surrounding loop is unconditionally terminated`. Signed-off-by: Andrey Butusov <[email protected]>

*: suspend contextcheck lint error

660d542

Error in `cmd/neofs-node/config.go`: `Function `Reload->Init->init->listenEvents` should pass the context parameter`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix godot lint error

4f4cbb1

Error: `Comment should end in a period`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix misspell lint error

939bb4a

Signed-off-by: Andrey Butusov <[email protected]>

*: fix revive lint error

656adb5

Error: `duplicated-imports`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix gosimple lint errors

02aed6f

Errors: `S1023: redundant `return` statement` and `S1019: should use make(chan *Move) instead`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix govet lint error

b948d79

Error: `struct literal uses unkeyed fields`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix Receiver names are different lint error

5daae82

Signed-off-by: Andrey Butusov <[email protected]>

*: update math/rand to v2

428dfe1

Update to `math/rand/v2` and use `crypto/rand` for `rand.Read`. Signed-off-by: Andrey Butusov <[email protected]>

*: fix nil error checking

d411599

Signed-off-by: Andrey Butusov <[email protected]>

*: fix Variable collides with imported package name lint error

7468c36

Closes #2940. Signed-off-by: Andrey Butusov <[email protected]>

End-rey requested review from roman-khimov, carpawell and cthulhu-rider as code owners September 19, 2024 17:06

End-rey marked this pull request as draft September 19, 2024 17:10

roman-khimov reviewed Sep 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Org-wide linter #2943

Org-wide linter #2943

End-rey commented Sep 19, 2024

codecov bot commented Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

End-rey Sep 20, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

roman-khimov Sep 19, 2024

	ok, err := metaExists(db, object.AddressOf(child))
	require.Error(t, apistatus.ObjectAlreadyRemoved{})
	require.False(t, ok)

	ok, err = metaExists(db, object.AddressOf(parent))
	require.Error(t, apistatus.ObjectAlreadyRemoved{})
	require.False(t, ok)

		@@ -101,6 +101,7 @@ func equalListShardResponseBodies(b1, b2 *control.ListShardsResponse_Body) bool

		return true
		}

Org-wide linter #2943

Are you sure you want to change the base?

Org-wide linter #2943

Conversation

End-rey commented Sep 19, 2024

codecov bot commented Sep 19, 2024

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment