From 89c6d7299c7d33510ce50b6ce2586f578bb325e5 Mon Sep 17 00:00:00 2001
From: Mohammed Affan <mohammed.affan.727@gmail.com>
Date: Wed, 10 Jan 2024 12:51:29 +0530
Subject: [PATCH] Add linting for redefined builtin ids

Signed-off-by: Mohammed Affan <mohammed.affan.727@gmail.com>
---
 .golangci.yml       |  1 +
 pkg/util/binding.go | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 5899873b9..386ba8561 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -84,6 +84,7 @@ linters-settings:
       - name: indent-error-flow
       - name: unreachable-code
       - name: var-naming
+      - name: redefines-builtin-id
   staticcheck:
     checks:
       - all
diff --git a/pkg/util/binding.go b/pkg/util/binding.go
index 26dc9d59a..57a8dfc09 100644
--- a/pkg/util/binding.go
+++ b/pkg/util/binding.go
@@ -72,28 +72,28 @@ func ConvertToClusterNames(clusters []workv1alpha2.TargetCluster) sets.Set[strin
 }
 
 // MergeTargetClusters will merge the replicas in two TargetCluster
-func MergeTargetClusters(old, new []workv1alpha2.TargetCluster) []workv1alpha2.TargetCluster {
+func MergeTargetClusters(oldCluster, newCluster []workv1alpha2.TargetCluster) []workv1alpha2.TargetCluster {
 	switch {
-	case len(old) == 0:
-		return new
-	case len(new) == 0:
-		return old
+	case len(oldCluster) == 0:
+		return newCluster
+	case len(newCluster) == 0:
+		return oldCluster
 	}
 	// oldMap is a map of the result for the old replicas so that it can be merged with the new result easily
 	oldMap := make(map[string]int32)
-	for _, cluster := range old {
+	for _, cluster := range oldCluster {
 		oldMap[cluster.Name] = cluster.Replicas
 	}
 	// merge the new replicas and the data of old replicas
-	for i, cluster := range new {
+	for i, cluster := range newCluster {
 		value, ok := oldMap[cluster.Name]
 		if ok {
-			new[i].Replicas = cluster.Replicas + value
+			newCluster[i].Replicas = cluster.Replicas + value
 			delete(oldMap, cluster.Name)
 		}
 	}
 	for key, value := range oldMap {
-		new = append(new, workv1alpha2.TargetCluster{Name: key, Replicas: value})
+		newCluster = append(newCluster, workv1alpha2.TargetCluster{Name: key, Replicas: value})
 	}
-	return new
+	return newCluster
 }