Merge pull request #4568 from RainbowMango/pr_bump_golangci

bump golangci-lint to v1.55.2

.golangci.yml

@@ -89,6 +89,8 @@ linters-settings:
       - name: context-as-argument
       - name: context-keys-type
       - name: unexported-return
+      - name: time-naming
+      - name: empty-block
   staticcheck:
     checks:
       - all

hack/verify-staticcheck.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-GOLANGCI_LINT_VER="v1.52.2"
+GOLANGCI_LINT_VER="v1.55.2"
 
 cd "${REPO_ROOT}"
 source "hack/util.sh"

pkg/apis/cluster/validation/validation_test.go

@@ -313,12 +313,13 @@ func TestValidateCluster(t *testing.T) {
 	}
 
 	for name, testCase := range testCases {
-		errs := ValidateCluster(&testCase.cluster)
+		pinedCase := testCase
-		if len(errs) == 0 && testCase.expectError {
+		errs := ValidateCluster(&pinedCase.cluster)
+		if len(errs) == 0 && pinedCase.expectError {
 			t.Errorf("expected failure for %q, but there were none", name)
 			return
 		}
-		if len(errs) != 0 && !testCase.expectError {
+		if len(errs) != 0 && !pinedCase.expectError {
 			t.Errorf("expected success for %q, but there were errors: %v", name, errs)
 			return
 		}

pkg/printers/internalversion/printers_test.go

@@ -69,16 +69,16 @@ func TestPrintCluster(t *testing.T) {
 		},
 	}
 
-	for i, test := range tests {
+	for i := range tests {
-		rows, err := printCluster(&test.cluster, test.generateOptions)
+		rows, err := printCluster(&tests[i].cluster, tests[i].generateOptions)
 		if err != nil {
 			t.Fatal(err)
 		}
 		for i := range rows {
 			rows[i].Object.Object = nil
 		}
-		if !reflect.DeepEqual(test.expect, rows) {
+		if !reflect.DeepEqual(tests[i].expect, rows) {
-			t.Errorf("%d mismatch: %s", i, diff.ObjectReflectDiff(test.expect, rows))
+			t.Errorf("%d mismatch: %s", i, diff.ObjectReflectDiff(tests[i].expect, rows))
 		}
 	}
 }

pkg/scheduler/core/assignment.go

@@ -180,7 +180,7 @@ func assignByDynamicStrategy(state *assignState) ([]workv1alpha2.TargetCluster,
 			return nil, fmt.Errorf("failed to scale up: %v", err)
 		}
 		return result, nil
-	} else {
-		return state.scheduledClusters, nil
 	}
+
+	return state.scheduledClusters, nil
 }

pkg/scheduler/core/spreadconstraint/select_clusters.go

@@ -54,9 +54,9 @@ func selectBestClustersBySpreadConstraints(spreadConstraints []policyv1alpha1.Sp
 		return selectBestClustersByRegion(spreadConstraintMap, groupClustersInfo)
 	} else if _, exist := spreadConstraintMap[policyv1alpha1.SpreadByFieldCluster]; exist {
 		return selectBestClustersByCluster(spreadConstraintMap[policyv1alpha1.SpreadByFieldCluster], groupClustersInfo, needReplicas)
-	} else {
-		return nil, fmt.Errorf("just support cluster and region spread constraint")
 	}
+
+	return nil, fmt.Errorf("just support cluster and region spread constraint")
 }
 
 func shouldIgnoreSpreadConstraint(placement *policyv1alpha1.Placement) bool {

pkg/search/proxy/store/util.go

@@ -315,9 +315,9 @@ func (n *MultiNamespace) Single() (string, bool) {
 	if n.allNamespaces || n.namespaces.Len() != 1 {
 		return "", false
 	}
-	var ns string
+
-	for ns = range n.namespaces {
+	// reach here means there is exactly one namespace, so we can safely get it.
-	}
+	ns := sets.List(n.namespaces)[0]
 	return ns, true
 }
 

pkg/util/binding_test.go

@@ -76,11 +76,11 @@ func TestGetBindingClusterNames(t *testing.T) {
 		},
 	}
 
-	for _, tt := range tests {
+	for i := range tests {
-		t.Run(tt.name, func(t *testing.T) {
+		t.Run(tests[i].name, func(t *testing.T) {
-			got := GetBindingClusterNames(&tt.binding.Spec)
+			got := GetBindingClusterNames(&tests[i].binding.Spec)
-			if !reflect.DeepEqual(got, tt.expected) {
+			if !reflect.DeepEqual(got, tests[i].expected) {
-				t.Errorf("GetBindingClusterNames() = %v, want %v", got, tt.expected)
+				t.Errorf("GetBindingClusterNames() = %v, want %v", got, tests[i].expected)
 			}
 		})
 	}

pkg/util/helper/workstatus.go

@@ -229,14 +229,14 @@ func assembleWorkStatus(works []workv1alpha1.Work, workload *unstructured.Unstru
 			Health:      workv1alpha2.ResourceUnknown,
 		}
 
-		for _, manifestStatus := range work.Status.ManifestStatuses {
+		for i := range work.Status.ManifestStatuses {
-			equal, err := equalIdentifier(&manifestStatus.Identifier, identifierIndex, workload)
+			equal, err := equalIdentifier(&work.Status.ManifestStatuses[i].Identifier, identifierIndex, workload)
 			if err != nil {
 				return nil, err
 			}
 			if equal {
-				aggregatedStatus.Status = manifestStatus.Status
+				aggregatedStatus.Status = work.Status.ManifestStatuses[i].Status
-				aggregatedStatus.Health = workv1alpha2.ResourceHealth(manifestStatus.Health)
+				aggregatedStatus.Health = workv1alpha2.ResourceHealth(work.Status.ManifestStatuses[i].Health)
 				break
 			}
 		}

pkg/util/validation/validation.go

@@ -94,17 +94,17 @@ func ValidateClusterAffinities(affinities []policyv1alpha1.ClusterAffinityTerm,
 	var allErrs field.ErrorList
 
 	affinityNames := make(map[string]bool)
-	for index, term := range affinities {
+	for index := range affinities {
-		for _, err := range validation.IsQualifiedName(term.AffinityName) {
+		for _, err := range validation.IsQualifiedName(affinities[index].AffinityName) {
-			allErrs = append(allErrs, field.Invalid(fldPath.Index(index), term.AffinityName, err))
+			allErrs = append(allErrs, field.Invalid(fldPath.Index(index), affinities[index].AffinityName, err))
 		}
-		if _, exist := affinityNames[term.AffinityName]; exist {
+		if _, exist := affinityNames[affinities[index].AffinityName]; exist {
 			allErrs = append(allErrs, field.Invalid(fldPath, affinities, "each affinity term in a policy must have a unique name"))
 		} else {
-			affinityNames[term.AffinityName] = true
+			affinityNames[affinities[index].AffinityName] = true
 		}
 
-		allErrs = append(allErrs, ValidateClusterAffinity(&term.ClusterAffinity, fldPath.Index(index))...)
+		allErrs = append(allErrs, ValidateClusterAffinity(&affinities[index].ClusterAffinity, fldPath.Index(index))...)
 	}
 	return allErrs
 }