Upgrade golangci-lint to 1.64.8

All above these version: github.com/golangci/golangci-lint/cmd/[email protected] github.com/daixiang0/[email protected] sigs.k8s.io/kustomize/kustomize/[email protected] gosec => 2.22.2 kustomize => 5.6.
ref: https://issues.redhat.com/browse/ACM-8341
Signed-off-by: yiraeChristineKim <[email protected]>

Author: yiraeChristineKim

build/common/Makefile.common.mk

@@ -5,15 +5,15 @@
 # https://github.com/kubernetes-sigs/controller-tools/releases/latest
 CONTROLLER_GEN_VERSION := v0.16.3
 # https://github.com/kubernetes-sigs/kustomize/releases/latest
-KUSTOMIZE_VERSION := v5.4.3
+KUSTOMIZE_VERSION := v5.6.0
 # https://github.com/golangci/golangci-lint/releases/latest
-GOLANGCI_VERSION := v1.52.2
+GOLANGCI_VERSION := v1.64.8
 # https://github.com/mvdan/gofumpt/releases/latest
 GOFUMPT_VERSION := v0.7.0
 # https://github.com/daixiang0/gci/releases/latest
 GCI_VERSION := v0.13.5
 # https://github.com/securego/gosec/releases/latest
-GOSEC_VERSION := v2.21.3
+GOSEC_VERSION := v2.22.2
 # https://github.com/kubernetes-sigs/kubebuilder/releases/latest
 KBVERSION := 3.15.1
 # https://github.com/kubernetes/kubernetes/releases/latest

build/common/config/.golangci.yml

@@ -24,6 +24,7 @@ run:
 linters:
   enable-all: true
   disable:
+    - mnd # Disabled as tech debt: Magic number detection
     - bodyclose
     - cyclop
     - depguard

internal/expanders/expanders_utils_test.go

@@ -11,14 +11,14 @@ func assertEqual(t *testing.T, a interface{}, b interface{}) {
 	t.Helper()
 
 	if a != b {
-		t.Fatalf(cmp.Diff(a, b))
+		t.Fatal(cmp.Diff(a, b))
 	}
 }
 
 func assertReflectEqual(t *testing.T, a interface{}, b interface{}) {
 	t.Helper()
 
 	if !reflect.DeepEqual(a, b) {
-		t.Fatalf(cmp.Diff(a, b))
+		t.Fatal(cmp.Diff(a, b))
 	}
 }

internal/expanders/gatekeeper.go

@@ -2,8 +2,6 @@
 package expanders
 
 import (
-	"fmt"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"open-cluster-management.io/policy-generator-plugin/internal/types"
@@ -54,7 +52,7 @@ func (g GatekeeperPolicyExpander) Expand(
 	constraintName, _, _ := unstructured.NestedString(manifest, "metadata", "name")
 	constraintKind, _, _ := unstructured.NestedString(manifest, "kind")
 
-	auditConfigPolicyName := fmt.Sprintf("inform-gatekeeper-audit-%s", constraintName)
+	auditConfigPolicyName := "inform-gatekeeper-audit-" + constraintName
 	auditConfigurationPolicy := map[string]interface{}{
 		"objectDefinition": map[string]interface{}{
 			"apiVersion": configPolicyAPIVersion,
@@ -87,7 +85,7 @@ func (g GatekeeperPolicyExpander) Expand(
 	}
 	// Further improvements here could be made by having the user specify the Gatekeeper namespace and
 	// targeting the events for the constraint kind to just that namespace.
-	admissionConfigPolicyName := fmt.Sprintf("inform-gatekeeper-admission-%s", constraintName)
+	admissionConfigPolicyName := "inform-gatekeeper-admission-" + constraintName
 	admissionConfigurationPolicy := map[string]interface{}{
 		"objectDefinition": map[string]interface{}{
 			"apiVersion": configPolicyAPIVersion,

internal/expanders/gatekeeper_test.go

@@ -17,11 +17,11 @@ func TestGatekeeperCanHandle(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(
-			fmt.Sprintf("kind=%s", test.kind),
+			"kind="+test.kind,
 			func(t *testing.T) {
 				t.Parallel()
+
 				manifest := map[string]interface{}{
 					"apiVersion": gatekeeperConstraintAPIVersion,
 					"kind":       test.kind,
@@ -46,11 +46,11 @@ func TestGatekeeperCanHandleInvalid(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(
 			fmt.Sprintf("apiVersion=%s,kind=%s,name=%s", test.apiVersion, test.kind, test.name),
 			func(t *testing.T) {
 				t.Parallel()
+
 				manifest := map[string]interface{}{
 					"apiVersion": test.apiVersion,
 					"kind":       test.kind,

internal/expanders/kyverno.go

@@ -2,8 +2,6 @@
 package expanders
 
 import (
-	"fmt"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"open-cluster-management.io/policy-generator-plugin/internal/types"
@@ -50,7 +48,7 @@ func (k KyvernoPolicyExpander) Expand(
 	// This was previously validated in the CanHandle method.
 	policyName, _, _ := unstructured.NestedString(manifest, "metadata", "name")
 
-	configPolicyName := fmt.Sprintf("inform-kyverno-%s", policyName)
+	configPolicyName := "inform-kyverno-" + policyName
 	configurationPolicy := map[string]interface{}{
 		"objectDefinition": map[string]interface{}{
 			"apiVersion": configPolicyAPIVersion,

internal/expanders/kyverno_test.go

@@ -18,11 +18,11 @@ func TestKyvernoCanHandle(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(
-			fmt.Sprintf("kind=%s", test.kind),
+			"kind="+test.kind,
 			func(t *testing.T) {
 				t.Parallel()
+
 				manifest := map[string]interface{}{
 					"apiVersion": kyvernoAPIVersion,
 					"kind":       test.kind,
@@ -49,11 +49,11 @@ func TestKyvernoCanHandleInvalid(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(
 			fmt.Sprintf("apiVersion=%s,kind=%s,name=%s", test.apiVersion, test.kind, test.name),
 			func(t *testing.T) {
 				t.Parallel()
+
 				manifest := map[string]interface{}{
 					"apiVersion": test.apiVersion,
 					"kind":       test.kind,

internal/patches.go

@@ -18,8 +18,8 @@ import (
 
 type kustomizeFile struct {
 	OpenAPI   types.Filepath   `json:"openapi,omitempty" yaml:"openapi,omitempty"`
-	Patches   []types.Filepath `json:"patches" yaml:"patches"`
-	Resources []string         `json:"resources" yaml:"resources"`
+	Patches   []types.Filepath `json:"patches"           yaml:"patches"`
+	Resources []string         `json:"resources"         yaml:"resources"`
 }
 
 type manifestPatcher struct {

internal/patches_test.go

@@ -99,18 +99,20 @@ func TestValidateManifestMissingData(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
-		name := fmt.Sprintf("manifest missing %s", strings.Join(test.missingFields, "."))
+		name := "manifest missing " + strings.Join(test.missingFields, ".")
 
 		t.Run(
 			name,
 			func(t *testing.T) {
 				t.Parallel()
+
 				configmap := *createExConfigMap("configmap1")
+
 				err := unstructured.SetNestedField(configmap, "", test.missingFields...)
 				if err != nil {
 					t.Fatal(err.Error())
 				}
+
 				manifests := []map[string]interface{}{configmap}
 
 				patcher := manifestPatcher{manifests: manifests, patches: []map[string]interface{}{}}
@@ -136,8 +138,7 @@ func TestValidatePatchMissingData(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
-		name := fmt.Sprintf("patch missing %s", strings.Join(test.missingFields, "."))
+		name := "patch missing " + strings.Join(test.missingFields, ".")
 
 		t.Run(
 			name,
@@ -159,10 +160,12 @@ func TestValidatePatchMissingData(t *testing.T) {
 						},
 					},
 				}
+
 				err := unstructured.SetNestedField(patch, "", test.missingFields...)
 				if err != nil {
 					t.Fatal(err.Error())
 				}
+
 				patches := []map[string]interface{}{patch}
 
 				patcher := manifestPatcher{manifests: manifests, patches: patches}
@@ -187,8 +190,7 @@ func TestValidatePatchInvalidSingleManifest(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
-		name := fmt.Sprintf("patch invalid %s", strings.Join(test.invalidFields, "."))
+		name := "patch invalid " + strings.Join(test.invalidFields, ".")
 
 		t.Run(
 			name,
@@ -207,10 +209,12 @@ func TestValidatePatchInvalidSingleManifest(t *testing.T) {
 						},
 					},
 				}
+
 				err := unstructured.SetNestedField(patch, true, test.invalidFields...)
 				if err != nil {
 					t.Fatal(err.Error())
 				}
+
 				patches := []map[string]interface{}{patch}
 
 				patcher := manifestPatcher{manifests: manifests, patches: patches}