chore: enable unused-parameter and var-declaration from revive (#668)

mmorel-35 · web-flow · commit ccee58366a99 · 2025-02-07T09:55:39.000-05:00
Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -98,11 +98,9 @@ linters-settings:
         disabled: true
       - name: unreachable-code
       - name: unused-parameter
-        disabled: true
       - name: use-any
       - name: useless-break
       - name: var-declaration
-        disabled: true
       - name: var-naming
         disabled: true
   testifylint:
diff --git a/agent/main.go b/agent/main.go
@@ -150,7 +150,7 @@ func newCmd(log logr.Logger) *cobra.Command {
 			clusterCache := cache.NewClusterCache(config,
 				cache.SetNamespaces(namespaces),
 				cache.SetLogr(log),
-				cache.SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+				cache.SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 					// store gc mark of every resource
 					gcMark := un.GetAnnotations()[annotationGCMark]
 					info = &resourceInfo{gcMark: un.GetAnnotations()[annotationGCMark]}
@@ -175,7 +175,7 @@ func newCmd(log logr.Logger) *cobra.Command {
 					resync <- true
 				}
 			}()
-			http.HandleFunc("/api/v1/sync", func(writer http.ResponseWriter, request *http.Request) {
+			http.HandleFunc("/api/v1/sync", func(_ http.ResponseWriter, _ *http.Request) {
 				log.Info("Synchronization triggered by API call")
 				resync <- true
 			})
diff --git a/pkg/cache/cluster.go b/pkg/cache/cluster.go
@@ -264,12 +264,12 @@ type clusterCacheSync struct {
 }
 
 // ListRetryFuncNever never retries on errors
-func ListRetryFuncNever(err error) bool {
+func ListRetryFuncNever(_ error) bool {
 	return false
 }
 
 // ListRetryFuncAlways always retries on errors
-func ListRetryFuncAlways(err error) bool {
+func ListRetryFuncAlways(_ error) bool {
 	return true
 }
 
@@ -589,7 +589,7 @@ func (c *clusterCache) listResources(ctx context.Context, resClient dynamic.Reso
 	}
 	defer c.listSemaphore.Release(1)
 
-	var retryCount int64 = 0
+	var retryCount int64
 	resourceVersion := ""
 	listPager := pager.New(func(ctx context.Context, opts metav1.ListOptions) (runtime.Object, error) {
 		var res *unstructured.UnstructuredList
diff --git a/pkg/cache/cluster_test.go b/pkg/cache/cluster_test.go
@@ -84,7 +84,7 @@ func newCluster(t testing.TB, objs ...runtime.Object) *clusterCache {
 	return cache
 }
 
-func newClusterWithOptions(t testing.TB, opts []UpdateSettingsFunc, objs ...runtime.Object) *clusterCache {
+func newClusterWithOptions(_ testing.TB, opts []UpdateSettingsFunc, objs ...runtime.Object) *clusterCache {
 	client := fake.NewSimpleDynamicClient(scheme.Scheme, objs...)
 	reactor := client.ReactionChain[0]
 	client.PrependReactor("list", "*", func(action testcore.Action) (handled bool, ret runtime.Object, err error) {
@@ -175,7 +175,7 @@ func Benchmark_sync(t *testing.B) {
 
 	c := newCluster(t, resources...)
 
-	c.populateResourceInfoHandler = func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	c.populateResourceInfoHandler = func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		time.Sleep(10 * time.Microsecond)
 		return nil, false
 	}
@@ -394,7 +394,7 @@ func TestGetChildren(t *testing.T) {
 
 func TestGetManagedLiveObjs(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 
@@ -420,7 +420,7 @@ metadata:
 
 func TestGetManagedLiveObjsNamespacedModeClusterLevelResource(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 	cluster.namespaces = []string{"default", "production"}
@@ -445,7 +445,7 @@ metadata:
 
 func TestGetManagedLiveObjsNamespacedModeClusterLevelResource_ClusterResourceEnabled(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 	cluster.namespaces = []string{"default", "production"}
@@ -486,7 +486,7 @@ metadata:
 
 func TestGetManagedLiveObjsAllNamespaces(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 	cluster.namespaces = nil
@@ -514,7 +514,7 @@ metadata:
 
 func TestGetManagedLiveObjsValidNamespace(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 	cluster.namespaces = []string{"default", "production"}
@@ -542,7 +542,7 @@ metadata:
 
 func TestGetManagedLiveObjsInvalidNamespace(t *testing.T) {
 	cluster := newCluster(t, testPod1(), testRS(), testDeploy())
-	cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+	cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 		return nil, true
 	}))
 	cluster.namespaces = []string{"default", "develop"}
@@ -602,7 +602,7 @@ func TestGetManagedLiveObjsFailedConversion(t *testing.T) {
 						Meta:                 metav1.APIResource{Namespaced: true},
 					},
 				})
-			cluster.Invalidate(SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+			cluster.Invalidate(SetPopulateResourceInfoHandler(func(_ *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 				return nil, true
 			}))
 			cluster.namespaces = []string{"default"}
@@ -634,7 +634,7 @@ metadata:
 					return testCronTab(), nil
 				})
 
-			managedObjs, err := cluster.GetManagedLiveObjs([]*unstructured.Unstructured{targetDeploy}, func(r *Resource) bool {
+			managedObjs, err := cluster.GetManagedLiveObjs([]*unstructured.Unstructured{targetDeploy}, func(_ *Resource) bool {
 				return true
 			})
 			assert.NoError(t, err)
@@ -1258,7 +1258,7 @@ func Test_watchEvents_Deadlock(t *testing.T) {
 		// Resync watches often to use the semaphore and trigger the rate limiting behavior
 		SetResyncTimeout(500 * time.Millisecond),
 		// Use new resource handler to run code in the list callbacks
-		SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+		SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 			if un.GroupVersionKind().GroupKind() == res1.GroupVersionKind().GroupKind() ||
 				un.GroupVersionKind().GroupKind() == res2.GroupVersionKind().GroupKind() {
 				// Create a bottleneck for resources holding the semaphore
@@ -1370,7 +1370,7 @@ func BenchmarkIterateHierarchyV2(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		cluster.IterateHierarchyV2([]kube.ResourceKey{
 			{Namespace: "default", Name: "test-1", Kind: "Pod"},
-		}, func(child *Resource, _ map[kube.ResourceKey]*Resource) bool {
+		}, func(_ *Resource, _ map[kube.ResourceKey]*Resource) bool {
 			return true
 		})
 	}
diff --git a/pkg/cache/predicates_test.go b/pkg/cache/predicates_test.go
@@ -98,7 +98,7 @@ func ExampleNewClusterCache_inspectNamespaceResources() {
 		// cache default namespace only
 		SetNamespaces([]string{"default", "kube-system"}),
 		// configure custom logic to cache resources manifest and additional metadata
-		SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, isRoot bool) (info any, cacheManifest bool) {
+		SetPopulateResourceInfoHandler(func(un *unstructured.Unstructured, _ bool) (info any, cacheManifest bool) {
 			// if resource belongs to 'extensions' group then mark if with 'deprecated' label
 			if un.GroupVersionKind().Group == "extensions" {
 				info = []string{"deprecated"}
diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go
@@ -57,7 +57,7 @@ type DiffResultList struct {
 
 type noopNormalizer struct{}
 
-func (n *noopNormalizer) Normalize(un *unstructured.Unstructured) error {
+func (n *noopNormalizer) Normalize(_ *unstructured.Unstructured) error {
 	return nil
 }
 
@@ -201,7 +201,7 @@ func serverSideDiff(config, live *unstructured.Unstructured, opts ...Option) (*D
 // managedFields. All fields under this condition will be reverted with their state
 // from live. If the given predictedLive does not have the managedFields, an error
 // will be returned.
-func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkParser *managedfields.GvkParser, manager string) (*unstructured.Unstructured, error) {
+func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkParser *managedfields.GvkParser, _ string) (*unstructured.Unstructured, error) {
 	plManagedFields := predictedLive.GetManagedFields()
 	if len(plManagedFields) == 0 {
 		return nil, fmt.Errorf("predictedLive for resource %s/%s must have the managedFields", predictedLive.GetKind(), predictedLive.GetName())
diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go
@@ -895,7 +895,7 @@ func TestServerSideDiff(t *testing.T) {
 		dryRunner := mocks.NewServerSideDryRunner(t)
 
 		dryRunner.On("Run", mock.Anything, mock.AnythingOfType("*unstructured.Unstructured"), manager).
-			Return(func(ctx context.Context, obj *unstructured.Unstructured, manager string) (string, error) {
+			Return(func(_ context.Context, _ *unstructured.Unstructured, _ string) (string, error) {
 				return predictedLive, nil
 			})
 		opts := []Option{
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -92,7 +92,7 @@ func (e *gitOpsEngine) Sync(ctx context.Context,
 
 	resUpdated := make(chan bool)
 	resIgnore := make(chan struct{})
-	unsubscribe := e.cache.OnResourceUpdated(func(newRes *cache.Resource, oldRes *cache.Resource, namespaceResources map[kube.ResourceKey]*cache.Resource) {
+	unsubscribe := e.cache.OnResourceUpdated(func(newRes *cache.Resource, oldRes *cache.Resource, _ map[kube.ResourceKey]*cache.Resource) {
 		var key kube.ResourceKey
 		if newRes != nil {
 			key = newRes.ResourceKey()
diff --git a/pkg/sync/reconcile_test.go b/pkg/sync/reconcile_test.go
@@ -13,7 +13,7 @@ import (
 
 type unknownResourceInfoProvider struct{}
 
-func (e *unknownResourceInfoProvider) IsNamespaced(gk schema.GroupKind) (bool, error) {
+func (e *unknownResourceInfoProvider) IsNamespaced(_ schema.GroupKind) (bool, error) {
 	return false, errors.New("unknown")
 }
 
diff --git a/pkg/sync/sync_context.go b/pkg/sync/sync_context.go
@@ -598,7 +598,7 @@ func (sc *syncContext) GetState() (common.OperationPhase, string, []common.Resou
 }
 
 func (sc *syncContext) setOperationFailed(syncFailTasks, syncFailedTasks syncTasks, message string) {
-	errorMessageFactory := func(tasks []*syncTask, message string) string {
+	errorMessageFactory := func(_ []*syncTask, message string) string {
 		messages := syncFailedTasks.Map(func(task *syncTask) string {
 			return task.message
 		})
@@ -933,7 +933,7 @@ func (sc *syncContext) setOperationPhase(phase common.OperationPhase, message st
 
 // ensureCRDReady waits until specified CRD is ready (established condition is true).
 func (sc *syncContext) ensureCRDReady(name string) error {
-	return wait.PollUntilContextTimeout(context.Background(), time.Duration(100)*time.Millisecond, crdReadinessTimeout, true, func(ctx context.Context) (bool, error) {
+	return wait.PollUntilContextTimeout(context.Background(), time.Duration(100)*time.Millisecond, crdReadinessTimeout, true, func(_ context.Context) (bool, error) {
 		crd, err := sc.extensionsclientset.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), name, metav1.GetOptions{})
 		if err != nil {
 			return false, err
diff --git a/pkg/sync/sync_context_test.go b/pkg/sync/sync_context_test.go
@@ -68,7 +68,7 @@ func newTestSyncCtx(getResourceFunc *func(ctx context.Context, config *rest.Conf
 		syncRes:   map[string]synccommon.ResourceSyncResult{},
 		validate:  true,
 	}
-	sc.permissionValidator = func(un *unstructured.Unstructured, res *v1.APIResource) error {
+	sc.permissionValidator = func(_ *unstructured.Unstructured, _ *v1.APIResource) error {
 		return nil
 	}
 	mockKubectl := kubetest.MockKubectlCmd{}
@@ -106,7 +106,7 @@ func TestSyncValidate(t *testing.T) {
 }
 
 func TestSyncNotPermittedNamespace(t *testing.T) {
-	syncCtx := newTestSyncCtx(nil, WithPermissionValidator(func(un *unstructured.Unstructured, res *v1.APIResource) error {
+	syncCtx := newTestSyncCtx(nil, WithPermissionValidator(func(_ *unstructured.Unstructured, _ *v1.APIResource) error {
 		return fmt.Errorf("not permitted in project")
 	}))
 	targetPod := NewPod()
@@ -998,7 +998,7 @@ func TestNamespaceAutoCreation(t *testing.T) {
 	namespace := NewNamespace()
 	syncCtx := newTestSyncCtx(nil)
 	syncCtx.namespace = FakeArgoCDNamespace
-	syncCtx.syncNamespace = func(m, l *unstructured.Unstructured) (bool, error) {
+	syncCtx.syncNamespace = func(_, _ *unstructured.Unstructured) (bool, error) {
 		return true, nil
 	}
 	namespace.SetName(FakeArgoCDNamespace)
@@ -1091,7 +1091,7 @@ func TestNamespaceAutoCreation(t *testing.T) {
 }
 
 func TestNamespaceAutoCreationForNonExistingNs(t *testing.T) {
-	getResourceFunc := func(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string) (*unstructured.Unstructured, error) {
+	getResourceFunc := func(_ context.Context, _ *rest.Config, _ schema.GroupVersionKind, _ string, _ string) (*unstructured.Unstructured, error) {
 		return nil, apierrors.NewNotFound(schema.GroupResource{}, FakeArgoCDNamespace)
 	}
 
@@ -1107,7 +1107,7 @@ func TestNamespaceAutoCreationForNonExistingNs(t *testing.T) {
 			Target: []*unstructured.Unstructured{pod},
 		})
 		creatorCalled := false
-		syncCtx.syncNamespace = func(m, l *unstructured.Unstructured) (bool, error) {
+		syncCtx.syncNamespace = func(_, _ *unstructured.Unstructured) (bool, error) {
 			creatorCalled = true
 			return true, nil
 		}
@@ -1124,7 +1124,7 @@ func TestNamespaceAutoCreationForNonExistingNs(t *testing.T) {
 			Target: []*unstructured.Unstructured{pod},
 		})
 		creatorCalled := false
-		syncCtx.syncNamespace = func(m, l *unstructured.Unstructured) (bool, error) {
+		syncCtx.syncNamespace = func(_, _ *unstructured.Unstructured) (bool, error) {
 			creatorCalled = true
 			return false, nil
 		}
@@ -1141,7 +1141,7 @@ func TestNamespaceAutoCreationForNonExistingNs(t *testing.T) {
 			Target: []*unstructured.Unstructured{pod},
 		})
 		creatorCalled := false
-		syncCtx.syncNamespace = func(m, l *unstructured.Unstructured) (bool, error) {
+		syncCtx.syncNamespace = func(_, _ *unstructured.Unstructured) (bool, error) {
 			creatorCalled = true
 			return false, errors.New("some error")
 		}
@@ -1316,7 +1316,7 @@ func TestRunSync_HooksNotDeletedIfPhaseNotCompleted(t *testing.T) {
 	fakeDynamicClient := fake.NewSimpleDynamicClient(runtime.NewScheme())
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
-	fakeDynamicClient.PrependReactor("delete", "*", func(action testcore.Action) (handled bool, ret runtime.Object, err error) {
+	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
 		deletedCount += 1
 		return true, nil, nil
 	})
@@ -1362,7 +1362,7 @@ func TestRunSync_HooksDeletedAfterPhaseCompleted(t *testing.T) {
 	fakeDynamicClient := fake.NewSimpleDynamicClient(runtime.NewScheme())
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
-	fakeDynamicClient.PrependReactor("delete", "*", func(action testcore.Action) (handled bool, ret runtime.Object, err error) {
+	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
 		deletedCount += 1
 		return true, nil, nil
 	})
@@ -1408,7 +1408,7 @@ func TestRunSync_HooksDeletedAfterPhaseCompletedFailed(t *testing.T) {
 	fakeDynamicClient := fake.NewSimpleDynamicClient(runtime.NewScheme())
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
-	fakeDynamicClient.PrependReactor("delete", "*", func(action testcore.Action) (handled bool, ret runtime.Object, err error) {
+	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
 		deletedCount += 1
 		return true, nil, nil
 	})
@@ -1539,7 +1539,7 @@ func TestSyncWaveHook(t *testing.T) {
 	// call sync again, it should not invoke the SyncWaveHook callback since we only should be
 	// doing this after an apply, and not every reconciliation
 	called = false
-	syncCtx.syncWaveHook = func(phase synccommon.SyncPhase, wave int, final bool) error {
+	syncCtx.syncWaveHook = func(_ synccommon.SyncPhase, _ int, _ bool) error {
 		called = true
 		return nil
 	}
@@ -1590,7 +1590,7 @@ func TestSyncWaveHookFail(t *testing.T) {
 	})
 
 	called := false
-	syncCtx.syncWaveHook = func(phase synccommon.SyncPhase, wave int, final bool) error {
+	syncCtx.syncWaveHook = func(_ synccommon.SyncPhase, _ int, _ bool) error {
 		called = true
 		return errors.New("intentional error")
 	}
diff --git a/pkg/utils/kube/kube.go b/pkg/utils/kube/kube.go
@@ -409,7 +409,7 @@ func GetDeploymentReplicas(u *unstructured.Unstructured) *int64 {
 
 // RetryUntilSucceed keep retrying given action with specified interval until action succeed or specified context is done.
 func RetryUntilSucceed(ctx context.Context, interval time.Duration, desc string, log logr.Logger, action func() error) {
-	pollErr := wait.PollUntilContextCancel(ctx, interval, true, func(ctx context.Context) (bool /*done*/, error) {
+	pollErr := wait.PollUntilContextCancel(ctx, interval, true, func(_ context.Context) (bool /*done*/, error) {
 		log.V(1).Info(fmt.Sprintf("Start %s", desc))
 		err := action()
 		if err == nil {
diff --git a/pkg/utils/kube/kubetest/mock.go b/pkg/utils/kube/kubetest/mock.go
diff --git a/pkg/utils/kube/kubetest/mock_resource_operations.go b/pkg/utils/kube/kubetest/mock_resource_operations.go
diff --git a/pkg/utils/kube/resource_ops.go b/pkg/utils/kube/resource_ops.go
diff --git a/pkg/utils/tracing/nop.go b/pkg/utils/tracing/nop.go

Original file line number	Diff line number	Diff line change
`@@ -264,12 +264,12 @@ type clusterCacheSync struct {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// ListRetryFuncNever never retries on errors`
`267`		`-func ListRetryFuncNever(err error) bool {`
	`267`	`+func ListRetryFuncNever(_ error) bool {`
`268`	`268`	`return false`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`// ListRetryFuncAlways always retries on errors`
`272`		`-func ListRetryFuncAlways(err error) bool {`
	`272`	`+func ListRetryFuncAlways(_ error) bool {`
`273`	`273`	`return true`
`274`	`274`	`}`
`275`	`275`
`@@ -589,7 +589,7 @@ func (c *clusterCache) listResources(ctx context.Context, resClient dynamic.Reso`
`589`	`589`	`}`
`590`	`590`	`defer c.listSemaphore.Release(1)`
`591`	`591`
`592`		`- var retryCount int64 = 0`
	`592`	`+ var retryCount int64`
`593`	`593`	`resourceVersion := ""`
`594`	`594`	`listPager := pager.New(func(ctx context.Context, opts metav1.ListOptions) (runtime.Object, error) {`
`595`	`595`	`var res *unstructured.UnstructuredList`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`type unknownResourceInfoProvider struct{}`
`15`	`15`
`16`		`-func (e *unknownResourceInfoProvider) IsNamespaced(gk schema.GroupKind) (bool, error) {`
	`16`	`+func (e *unknownResourceInfoProvider) IsNamespaced(_ schema.GroupKind) (bool, error) {`
`17`	`17`	`return false, errors.New("unknown")`
`18`	`18`	`}`
`19`	`19`