fix predeclared linter

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

.golangci.yaml

@@ -15,7 +15,6 @@ linters:
           - musttag
           - nilerr
           - noctx
-          - predeclared
           - unparam
         text: .*
     paths: [third_party$, builtin$, examples$]

pkg/datagatherer/k8s/cache.go

@@ -56,14 +56,14 @@ func onAdd(log logr.Logger, obj interface{}, dgCache *cache.Cache) {
 // onUpdate handles the informer update events, replacing the old object with the new one
 // if it's present in the data gatherer's cache, (if the object isn't present, it gets added).
 // The cache key is the uid of the object
-func onUpdate(log logr.Logger, old, new interface{}, dgCache *cache.Cache) {
-	item, ok := old.(cacheResource)
+func onUpdate(log logr.Logger, oldObj, newObj interface{}, dgCache *cache.Cache) {
+	item, ok := oldObj.(cacheResource)
 	if ok {
-		cacheObject := updateCacheGatheredResource(string(item.GetUID()), new, dgCache)
+		cacheObject := updateCacheGatheredResource(string(item.GetUID()), newObj, dgCache)
 		dgCache.Set(string(item.GetUID()), cacheObject, cache.DefaultExpiration)
 		return
 	}
-	logCacheUpdateFailure(log, old, "update")
+	logCacheUpdateFailure(log, oldObj, "update")
 }
 
 // onDelete handles the informer deletion events, updating the object's properties with the deletion

pkg/datagatherer/k8s/cache_test.go

@@ -52,7 +52,9 @@ func TestOnAddCache(t *testing.T) {
 				getObject("v1", "Service", "testservice", "testns", false),
 				getObject("foobar/v1", "NotFoo", "notfoo", "testns", false),
 			},
-			eventFunc: func(log logr.Logger, old, new interface{}, dgCache *cache.Cache) { onDelete(log, old, dgCache) },
+			eventFunc: func(log logr.Logger, oldObj, newObj interface{}, dgCache *cache.Cache) {
+				onDelete(log, oldObj, dgCache)
+			},
 			expected: []*api.GatheredResource{
 				makeGatheredResource(
 					getObject("foobar/v1", "Foo", "testfoo", "testns", false),

pkg/datagatherer/k8s/dynamic.go

@@ -221,8 +221,8 @@ func (c *ConfigDynamic) newDataGathererWithClient(ctx context.Context, cl dynami
 		AddFunc: func(obj interface{}) {
 			onAdd(log, obj, dgCache)
 		},
-		UpdateFunc: func(old, new interface{}) {
-			onUpdate(log, old, new, dgCache)
+		UpdateFunc: func(oldObj, newObj interface{}) {
+			onUpdate(log, oldObj, newObj, dgCache)
 		},
 		DeleteFunc: func(obj interface{}) {
 			onDelete(log, obj, dgCache)

pkg/datagatherer/k8s/dynamic_test.go

@@ -672,7 +672,7 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
 				},
-				UpdateFunc: func(old, new interface{}) {
+				UpdateFunc: func(oldObj, newObj interface{}) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
 				},
@@ -718,8 +718,8 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 
 			for ns, update := range tc.updateObjects {
 				wg.Add(1)
-				new := update.(*unstructured.Unstructured)
-				_, err := cl.Resource(tc.config.GroupVersionResource).Namespace(ns).Update(ctx, new, metav1.UpdateOptions{})
+				newObj := update.(*unstructured.Unstructured)
+				_, err := cl.Resource(tc.config.GroupVersionResource).Namespace(ns).Update(ctx, newObj, metav1.UpdateOptions{})
 				if err != nil {
 					t.Fatalf("unexpected client update error: %+v", err)
 				}
@@ -988,7 +988,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
 				},
-				UpdateFunc: func(old, new interface{}) {
+				UpdateFunc: func(oldObj, newObj interface{}) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
 				},
@@ -1033,8 +1033,8 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 
 			for ns, update := range tc.updateObjects {
 				wg.Add(1)
-				new := update.(*corev1.Pod)
-				_, err := clientset.CoreV1().Pods(ns).Update(ctx, new, metav1.UpdateOptions{})
+				newObj := update.(*corev1.Pod)
+				_, err := clientset.CoreV1().Pods(ns).Update(ctx, newObj, metav1.UpdateOptions{})
 				if err != nil {
 					t.Fatalf("unexpected client update error: %+v", err)
 				}