Code Lint: Fix lint errors caused by revive check for unused parameters

revive v1.3.7 added mgechev/revive#966 which checks for unused parameters in function literals. This caused several lint errors in go-ceph code. Signed-off-by: Manish <[email protected]>
ceph · Feb 13, 2024 · 6f90ce1 · 6f90ce1
1 parent 0679355
commit 6f90ce1
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 95 deletions.
diff --git a/cephfs/userperm_test.go b/cephfs/userperm_test.go
@@ -25,7 +25,7 @@ func TestUserPerm(t *testing.T) {
 		uperm.Destroy()
 		uperm.Destroy()
 	})
-	t.Run("tryForceGc", func(t *testing.T) {
+	t.Run("tryForceGc", func(_ *testing.T) {
 		func() {
 			uperm := NewUserPerm(0, 0, nil)
 			_ = uperm

diff --git a/internal/cutil/command_input_test.go b/internal/cutil/command_input_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestCommandInput(t *testing.T) {
-	t.Run("newAndFree", func(t *testing.T) {
+	t.Run("newAndFree", func(_ *testing.T) {
 		ci := NewCommandInput(
 			[][]byte{[]byte("foobar")},
 			nil)

diff --git a/internal/cutil/ptrguard_test.go b/internal/cutil/ptrguard_test.go
@@ -40,7 +40,7 @@ func TestPtrGuard(t *testing.T) {
 		var pgDone, uDone bool
 		goPtr := func(b *bool) unsafe.Pointer {
 			s := "ok"
-			runtime.SetFinalizer(&s, func(p *string) { *b = true })
+			runtime.SetFinalizer(&s, func(_ *string) { *b = true })
 			return unsafe.Pointer(&s)
 		}
 		cPtr := Malloc(PtrSize)

diff --git a/internal/retry/sizer_test.go b/internal/retry/sizer_test.go
@@ -60,7 +60,7 @@ func TestSizer(t *testing.T) {
 	t.Run("exceedsMax", func(t *testing.T) {
 		var tries int
 		var err error
-		WithSizes(1, 1024, func(size int) Hint {
+		WithSizes(1, 1024, func(_ int) Hint {
 			tries++
 			err = errors.New("foo")
 			return DoubleSize

diff --git a/rados/rados_test.go b/rados/rados_test.go
@@ -1054,7 +1054,7 @@ func (suite *RadosTestSuite) TestListAcrossNamespaces() {
 	// count objects in pool
 	suite.ioctx.SetNamespace(AllNamespaces)
 	allFoundObjects := 0
-	err = suite.ioctx.ListObjects(func(oid string) {
+	err = suite.ioctx.ListObjects(func(_ string) {
 		allFoundObjects++
 	})
 	assert.NoError(suite.T(), err)
@@ -1289,14 +1289,14 @@ func (suite *RadosTestSuite) TestSetGetNamespace() {
 		assert.Equal(t, "space1", ns)
 	})
 
-	suite.T().Run("allNamespaces", func(t *testing.T) {
+	suite.T().Run("allNamespaces", func(_ *testing.T) {
 		suite.ioctx.SetNamespace(AllNamespaces)
 		ns, err := suite.ioctx.GetNamespace()
 		assert.NoError(suite.T(), err)
 		assert.Equal(suite.T(), AllNamespaces, ns)
 	})
 
-	suite.T().Run("invalidIoctx", func(t *testing.T) {
+	suite.T().Run("invalidIoctx", func(_ *testing.T) {
 		i := &IOContext{}
 		ns, err := i.GetNamespace()
 		assert.Error(suite.T(), err)

diff --git a/rbd/diff_iterate_test.go b/rbd/diff_iterate_test.go
@@ -46,7 +46,7 @@ func TestDiffIterate(t *testing.T) {
 			DiffIterateConfig{
 				Offset: 0,
 				Length: uint64(1 << 22),
-				Callback: func(o, l uint64, e int, x interface{}) int {
+				Callback: func(_, _ uint64, _ int, _ interface{}) int {
 					gotCalled++
 					return 0
 				},
@@ -111,7 +111,7 @@ func testDiffIterateBasic(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -127,7 +127,7 @@ func testDiffIterateBasic(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -146,7 +146,7 @@ func testDiffIterateBasic(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -167,7 +167,7 @@ func testDiffIterateBasic(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -190,7 +190,7 @@ func testDiffIterateBasic(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -256,7 +256,7 @@ func testDiffIterateTwoAtOnce(t *testing.T, ioctx *rados.IOContext) {
 			DiffIterateConfig{
 				Offset: 0,
 				Length: isize,
-				Callback: func(o, l uint64, e int, x interface{}) int {
+				Callback: func(o, l uint64, _ int, _ interface{}) int {
 					time.Sleep(8 * time.Millisecond)
 					calls = append(calls, diResult{offset: o, length: l})
 					return 0
@@ -326,7 +326,7 @@ func testDiffIterateEarlyExit(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				if o > 1 {
 					return -5
 				}
@@ -372,7 +372,7 @@ func testDiffIterateSnapshot(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -389,7 +389,7 @@ func testDiffIterateSnapshot(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -411,7 +411,7 @@ func testDiffIterateSnapshot(t *testing.T, ioctx *rados.IOContext) {
 			SnapName: "ss1",
 			Offset:   0,
 			Length:   isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -438,7 +438,7 @@ func testDiffIterateSnapshot(t *testing.T, ioctx *rados.IOContext) {
 			SnapName: "ss1",
 			Offset:   0,
 			Length:   isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, _ interface{}) int {
 				calls = append(calls, diResult{offset: o, length: l})
 				return 0
 			},
@@ -481,7 +481,7 @@ func testDiffIterateCallbackData(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, x interface{}) int {
 				if v, ok := x.(int); ok {
 					assert.EqualValues(t, 77, v)
 				} else {
@@ -503,7 +503,7 @@ func testDiffIterateCallbackData(t *testing.T, ioctx *rados.IOContext) {
 		DiffIterateConfig{
 			Offset: 0,
 			Length: isize,
-			Callback: func(o, l uint64, e int, x interface{}) int {
+			Callback: func(o, l uint64, _ int, x interface{}) int {
 				if v, ok := x.(string); ok {
 					assert.EqualValues(t, "bob", v)
 				} else {

diff --git a/rbd/group_snap_test.go b/rbd/group_snap_test.go
@@ -186,7 +186,7 @@ func TestGroupSnapshots(t *testing.T) {
 		assert.NoError(t, err)
 
 		cc := 0
-		cb := func(offset, total uint64, v interface{}) int {
+		cb := func(_, total uint64, v interface{}) int {
 			cc++
 			val := v.(int)
 			assert.Equal(t, 0, val)
@@ -234,7 +234,7 @@ func TestGroupSnapshots(t *testing.T) {
 			GroupSnapRollback(nil, gname, "foo")
 		})
 		assert.Panics(t, func() {
-			cb := func(o, t uint64, v interface{}) int { return 0 }
+			cb := func(_, _ uint64, _ interface{}) int { return 0 }
 			GroupSnapRollbackWithProgress(nil, gname, "foo", cb, nil)
 		})
 	})

diff --git a/rbd/resize_test.go b/rbd/resize_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestImageResize2(t *testing.T) {
 	cc := 0
-	cb := func(offset, total uint64, v interface{}) int {
+	cb := func(_, total uint64, v interface{}) int {
 		cc++
 		val := v.(int)
 		assert.Equal(t, 0, val)

diff --git a/rbd/sparsify_test.go b/rbd/sparsify_test.go
@@ -34,7 +34,7 @@ func TestSparsifyWithProgress(t *testing.T) {
 		defer func() { assert.NoError(t, img.Close()) }()
 
 		cc := 0
-		cb := func(offset, total uint64, v interface{}) int {
+		cb := func(_, total uint64, v interface{}) int {
 			cc++
 			val := v.(int)
 			assert.Equal(t, 0, val)
@@ -53,7 +53,7 @@ func TestSparsifyWithProgress(t *testing.T) {
 		defer func() { assert.NoError(t, img.Close()) }()
 
 		cc := 0
-		cb := func(offset, total uint64, v interface{}) int {
+		cb := func(_, total uint64, v interface{}) int {
 			cc++
 			val := v.(int)
 			assert.Equal(t, 0, val)
@@ -71,7 +71,7 @@ func TestSparsifyWithProgress(t *testing.T) {
 		assert.NoError(t, img.Close())
 
 		cc := 0
-		cb := func(offset, total uint64, v interface{}) int {
+		cb := func(_, total uint64, v interface{}) int {
 			cc++
 			val := v.(int)
 			assert.Equal(t, 0, val)

diff --git a/rbd/watchers_test.go b/rbd/watchers_test.go
@@ -143,7 +143,7 @@ func TestWatch(t *testing.T) {
 		err = image.Close()
 		require.NoError(t, err)
 
-		_, err = image.UpdateWatch(func(d interface{}) {
+		_, err = image.UpdateWatch(func(_ interface{}) {
 		}, nil)
 		assert.Equal(t, ErrImageNotOpen, err)
 	})
@@ -158,7 +158,7 @@ func TestWatch(t *testing.T) {
 		}()
 
 		cc := 0
-		w, err := image.UpdateWatch(func(d interface{}) {
+		w, err := image.UpdateWatch(func(_ interface{}) {
 			cc++
 		}, nil)
 		assert.NoError(t, err)
@@ -232,7 +232,7 @@ func TestWatchMultiChannels(t *testing.T) {
 		defer func() {
 			assert.NoError(t, img.Close())
 		}()
-		w, err := img.UpdateWatch(func(d interface{}) {
+		w, err := img.UpdateWatch(func(_ interface{}) {
 			mon <- n
 		}, nil)
 		require.NoError(t, err)

diff --git a/rgw/admin/bucket_quota_test.go b/rgw/admin/bucket_quota_test.go
@@ -21,19 +21,19 @@ func (suite *RadosGWTestSuite) TestBucketQuota() {
 	err = s3.createBucket(suite.bucketTestName)
 	assert.NoError(suite.T(), err)
 
-	suite.T().Run("set bucket quota but no user is specified", func(t *testing.T) {
+	suite.T().Run("set bucket quota but no user is specified", func(_ *testing.T) {
 		err := co.SetIndividualBucketQuota(context.Background(), QuotaSpec{})
 		assert.Error(suite.T(), err)
 		assert.EqualError(suite.T(), err, errMissingUserID.Error())
 	})
 
-	suite.T().Run("set bucket quota but no bucket is specified", func(t *testing.T) {
+	suite.T().Run("set bucket quota but no bucket is specified", func(_ *testing.T) {
 		err := co.SetIndividualBucketQuota(context.Background(), QuotaSpec{UID: "admin"})
 		assert.Error(suite.T(), err)
 		assert.EqualError(suite.T(), err, errMissingUserBucket.Error())
 	})
 
-	suite.T().Run("set bucket quota", func(t *testing.T) {
+	suite.T().Run("set bucket quota", func(_ *testing.T) {
 		err := co.SetIndividualBucketQuota(context.Background(), QuotaSpec{UID: "admin", Bucket: suite.bucketTestName, MaxSizeKb: &testBucketQuota})
 		assert.NoError(suite.T(), err)
 

diff --git a/rgw/admin/bucket_test.go b/rgw/admin/bucket_test.go
@@ -21,46 +21,46 @@ func (suite *RadosGWTestSuite) TestBucket() {
 	err = s3.createBucket(suite.bucketTestName)
 	assert.NoError(suite.T(), err)
 
-	suite.T().Run("list buckets", func(t *testing.T) {
+	suite.T().Run("list buckets", func(_ *testing.T) {
 		buckets, err := co.ListBuckets(context.Background())
 		assert.NoError(suite.T(), err)
 		assert.Equal(suite.T(), 1, len(buckets))
 	})
 
-	suite.T().Run("info non-existing bucket", func(t *testing.T) {
+	suite.T().Run("info non-existing bucket", func(_ *testing.T) {
 		_, err := co.GetBucketInfo(context.Background(), Bucket{Bucket: "foo"})
 		assert.Error(suite.T(), err)
 		assert.True(suite.T(), errors.Is(err, ErrNoSuchBucket), err)
 	})
 
-	suite.T().Run("info existing bucket", func(t *testing.T) {
+	suite.T().Run("info existing bucket", func(_ *testing.T) {
 		_, err := co.GetBucketInfo(context.Background(), Bucket{Bucket: suite.bucketTestName})
 		assert.NoError(suite.T(), err)
 	})
 
-	suite.T().Run("get policy non-existing bucket", func(t *testing.T) {
+	suite.T().Run("get policy non-existing bucket", func(_ *testing.T) {
 		_, err := co.GetBucketPolicy(context.Background(), Bucket{Bucket: "foo"})
 		assert.Error(suite.T(), err)
 		assert.True(suite.T(), errors.Is(err, ErrNoSuchKey), err)
 	})
 
-	suite.T().Run("get policy existing bucket", func(t *testing.T) {
+	suite.T().Run("get policy existing bucket", func(_ *testing.T) {
 		_, err := co.GetBucketPolicy(context.Background(), Bucket{Bucket: suite.bucketTestName})
 		assert.NoError(suite.T(), err)
 	})
 
-	suite.T().Run("remove bucket", func(t *testing.T) {
+	suite.T().Run("remove bucket", func(_ *testing.T) {
 		err := co.RemoveBucket(context.Background(), Bucket{Bucket: suite.bucketTestName})
 		assert.NoError(suite.T(), err)
 	})
 
-	suite.T().Run("list bucket is now zero", func(t *testing.T) {
+	suite.T().Run("list bucket is now zero", func(_ *testing.T) {
 		buckets, err := co.ListBuckets(context.Background())
 		assert.NoError(suite.T(), err)
 		assert.Equal(suite.T(), 0, len(buckets))
 	})
 
-	suite.T().Run("remove non-existing bucket", func(t *testing.T) {
+	suite.T().Run("remove non-existing bucket", func(_ *testing.T) {
 		err := co.RemoveBucket(context.Background(), Bucket{Bucket: "foo"})
 		assert.Error(suite.T(), err)
 		if util.CurrentCephVersion() <= util.CephOctopus {