Fix: Bump golangci-lint from 1.57 to 1.64; adjusted code accordingly.

Author: tmetsch

.github/workflows/sca.yml

@@ -47,6 +47,6 @@ jobs:
           go-version-file: 'go.mod'
       - name: golangci-lint
         run: |
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
           make golangci-lint
         shell: bash

pkg/api/plugins/v1alpha1/actuator_client_stub.go

@@ -116,7 +116,7 @@ func toGrpcStates(states []common.State) []*protobufs.State {
 func toGrpcProfile(v *common.Profile) *protobufs.Profile {
 	return &protobufs.Profile{
 		Key:         v.Key,
-		ProfileType: protobufs.ProfileType(v.ProfileType),
+		ProfileType: protobufs.ProfileType(v.ProfileType), //nolint:gosec // explanation: only limited # of profile types exist.
 	}
 }
 

pkg/controller/intent_monitor.go

@@ -42,11 +42,11 @@ func NewIntentMonitor(intentClient clientSet.Interface, intentInformer informers
 	// functions handler.
 	_, _ = intentInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: mon.enqueueItem,
-		UpdateFunc: func(old, new interface{}) {
-			if old.(*v1alpha1.Intent).ResourceVersion == new.(*v1alpha1.Intent).ResourceVersion {
+		UpdateFunc: func(oldResource, newResource interface{}) {
+			if oldResource.(*v1alpha1.Intent).ResourceVersion == newResource.(*v1alpha1.Intent).ResourceVersion {
 				return
 			}
-			mon.enqueueItem(new)
+			mon.enqueueItem(newResource)
 		},
 		DeleteFunc: func(obj interface{}) {
 			var key string

pkg/controller/pod_monitor.go

@@ -72,12 +72,12 @@ func NewPodMonitor(podClient kubernetes.Interface, informer coreInformer.PodInfo
 	// event handlers.
 	_, _ = informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		// No need to AddFunc, as POD is first pending...through an update is initially gets ready.
-		UpdateFunc: func(old, new interface{}) {
-			if old.(*coreV1.Pod).ResourceVersion == new.(*coreV1.Pod).ResourceVersion {
+		UpdateFunc: func(oldResource, newResource interface{}) {
+			if oldResource.(*coreV1.Pod).ResourceVersion == newResource.(*coreV1.Pod).ResourceVersion {
 				// no change --> nothing to do.
 				return
 			}
-			mon.enqueuePod(new)
+			mon.enqueuePod(newResource)
 		},
 		DeleteFunc: func(obj interface{}) {
 			var key string

pkg/controller/profile_monitor.go

@@ -62,12 +62,12 @@ func NewKPIProfileMonitor(cfg common.MonitorConfig, profileClient clientSet.Inte
 	// handle add, update & delete.
 	_, _ = profileInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: mon.enqueueItem,
-		UpdateFunc: func(old, new interface{}) {
-			if old.(*v1alpha1.KPIProfile).ResourceVersion == new.(*v1alpha1.KPIProfile).ResourceVersion {
+		UpdateFunc: func(oldResource, newResource interface{}) {
+			if oldResource.(*v1alpha1.KPIProfile).ResourceVersion == newResource.(*v1alpha1.KPIProfile).ResourceVersion {
 				// no change --> nothing to do.
 				return
 			}
-			mon.enqueueItem(new)
+			mon.enqueueItem(newResource)
 		},
 		DeleteFunc: func(obj interface{}) {
 			var key string

pkg/planner/actuators/scaling/scale_out.go

@@ -189,7 +189,7 @@ func (scale ScaleOutActuator) Perform(state *common.State, plan []planner.Action
 				return err
 			}
 			// conversion to int32 is ok - as we have a MaxPods defined
-			res.Spec.Replicas = getInt32Pointer(*res.Spec.Replicas + int32(factor))
+			res.Spec.Replicas = getInt32Pointer(*res.Spec.Replicas + int32(factor)) //nolint:gosec // explanation: casting len to int64 for API compatibility
 			if *res.Spec.Replicas > 0 {
 				_, updateErr := scale.apps.AppsV1().Deployments(namespace).Update(context.TODO(), res, metaV1.UpdateOptions{})
 				return updateErr
@@ -207,7 +207,7 @@ func (scale ScaleOutActuator) Perform(state *common.State, plan []planner.Action
 				return err
 			}
 			// conversion to int32 is ok - as we have a MaxPods defined
-			res.Spec.Replicas = getInt32Pointer(*res.Spec.Replicas + int32(factor))
+			res.Spec.Replicas = getInt32Pointer(*res.Spec.Replicas + int32(factor)) //nolint:gosec // explanation: casting len to int64 for API compatibility
 			if *res.Spec.Replicas > 0 {
 				_, updateErr := scale.apps.AppsV1().ReplicaSets(namespace).Update(context.TODO(), res, metaV1.UpdateOptions{})
 				return updateErr

pkg/tests/full_framework_test.go

@@ -451,7 +451,7 @@ func (f *testFixture) setWorkloadState(pods map[string]map[string]interface{}, r
 	// if deployment does not exist - add it.
 	res, err := f.k8sClient.AppsV1().Deployments("default").Get(context.TODO(), "function-deployment", metaV1.GetOptions{})
 	if err != nil || res == nil {
-		repl := int32(len(pods))
+		repl := int32(len(pods)) //nolint:gosec // explanation: casting len to int64 for API compatibility
 		deployment := &appsV1.Deployment{
 			ObjectMeta: metaV1.ObjectMeta{
 				Name:      "function-deployment",
@@ -628,31 +628,31 @@ func (f *testFixture) setCurrentData(vals map[string]map[string]float64) {
 }
 
 // comparePlans compares two planes and returns false if they are not the same.
-func comparePlans(old []map[string]interface{}, new []planner.Action) bool {
-	if len(new) != len(old) {
+func comparePlans(onePlan []map[string]interface{}, anotherPlan []planner.Action) bool {
+	if len(anotherPlan) != len(onePlan) {
 		return false
 	}
 	var oldPlan []planner.Action
-	for _, entry := range old {
+	for _, entry := range onePlan {
 		tmp := planner.Action{
 			Name:       entry["name"].(string),
 			Properties: entry["properties"],
 		}
 		oldPlan = append(oldPlan, tmp)
 	}
 	for i, item := range oldPlan {
-		if item.Name != new[i].Name {
-			klog.Infof("Expected action name: %v - got %v", item.Name, new[i].Name)
+		if item.Name != anotherPlan[i].Name {
+			klog.Infof("Expected action name: %v - got %v", item.Name, anotherPlan[i].Name)
 			return false
 		}
 		one := fmt.Sprintf("%v", item.Properties)
-		another := fmt.Sprintf("%v", new[i].Properties)
+		another := fmt.Sprintf("%v", anotherPlan[i].Properties)
 		if one != another && item.Name != "rmPod" {
 			klog.Infof("Expected property: %v - got %v", one, another)
 			return false
 		} else if item.Name == "rmPod" {
 			if one != another && len(one) == len(another) {
-				klog.Warningf("Not super sure - but looks ok: %v - %v", item.Properties, new[i].Properties)
+				klog.Warningf("Not super sure - but looks ok: %v - %v", item.Properties, anotherPlan[i].Properties)
 			} else if one != another {
 				klog.Infof("This does not look right; expected: %v - got %v", one, another)
 				return false