chore(core): cve mitigation in CSE

Signed-off-by: Dmitry Lopatin <dmitry.lopatin@flant.com>

Author: LopatinDmitr

images/virtualization-artifact/pkg/apiserver/registry/vm/storage/storage.go

@@ -185,7 +185,7 @@ func (store VirtualMachineStorage) List(ctx context.Context, options *internalve
 	if options != nil {
 		opts = *options
 	}
-	if !(opts.LabelSelector == nil || opts.LabelSelector.Empty()) {
+	if opts.LabelSelector != nil && !opts.LabelSelector.Empty() {
 		labelSelector = opts.LabelSelector
 	}
 

images/virtualization-artifact/pkg/audit/events/forbid/forbid_test.go

@@ -93,7 +93,7 @@ var _ = Describe("Forbid Events", func() {
 			}
 
 			fakeClient := fake.NewSimpleClientset()
-			fakeClient.Fake.PrependReactor("create", "subjectaccessreviews", func(action kubetesting.Action) (
+			fakeClient.PrependReactor("create", "subjectaccessreviews", func(action kubetesting.Action) (
 				handled bool,
 				ret runtime.Object,
 				err error,

images/virtualization-artifact/pkg/common/array/array.go

@@ -36,7 +36,7 @@ func SetArrayElem[T any](elems []T, newElem T, matchFunc func(v1, v2 T) bool, re
 	if !isFound {
 		res = append(res, newElem)
 	}
-	return
+	return res
 }
 
 type FilterFunc[T any] func(obj *T) (keep bool)

images/virtualization-artifact/pkg/common/pointer/pointer.go

@@ -25,7 +25,7 @@ func ToPointersArray[T any](items []T) (res []*T) {
 	for _, item := range items {
 		res = append(res, GetPointer(item))
 	}
-	return
+	return res
 }
 
 func GetPointer[T any](obj T) *T {

images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go

@@ -73,7 +73,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 	cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation)
 	defer func() {
 		// It is necessary to avoid setting unknown for the ready condition if it was already set to true.
-		if !(cb.Condition().Status == metav1.ConditionUnknown && condition.Status == metav1.ConditionTrue) {
+		if cb.Condition().Status != metav1.ConditionUnknown || condition.Status != metav1.ConditionTrue {
 			conditions.SetCondition(cb, &cvi.Status.Conditions)
 		}
 	}()

images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go

@@ -90,7 +90,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 	cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation)
 	defer func() {
 		// It is necessary to avoid setting unknown for the ready condition if it was already set to true.
-		if !(cb.Condition().Status == metav1.ConditionUnknown && condition.Status == metav1.ConditionTrue) {
+		if cb.Condition().Status != metav1.ConditionUnknown || condition.Status != metav1.ConditionTrue {
 			conditions.SetCondition(cb, &cvi.Status.Conditions)
 		}
 	}()

images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go

@@ -78,7 +78,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 	cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation)
 	defer func() {
 		// It is necessary to avoid setting unknown for the ready condition if it was already set to true.
-		if !(cb.Condition().Status == metav1.ConditionUnknown && condition.Status == metav1.ConditionTrue) {
+		if cb.Condition().Status != metav1.ConditionUnknown || condition.Status != metav1.ConditionTrue {
 			conditions.SetCondition(cb, &cvi.Status.Conditions)
 		}
 	}()

images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go

@@ -73,7 +73,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 	cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation)
 	defer func() {
 		// It is necessary to avoid setting unknown for the ready condition if it was already set to true.
-		if !(cb.Condition().Status == metav1.ConditionUnknown && condition.Status == metav1.ConditionTrue) {
+		if cb.Condition().Status != metav1.ConditionUnknown || condition.Status != metav1.ConditionTrue {
 			conditions.SetCondition(cb, &cvi.Status.Conditions)
 		}
 	}()

images/virtualization-artifact/pkg/controller/cvi/internal/watcher/vdsnapshot_watcher.go

@@ -76,7 +76,7 @@ func (w VirtualDiskSnapshotWatcher) enqueueRequests(ctx context.Context, vdSnaps
 	})
 	if err != nil {
 		w.logger.Error(fmt.Sprintf("failed to list cluster virtual images: %s", err))
-		return
+		return requests
 	}
 
 	for _, cvi := range cvis.Items {
@@ -92,7 +92,7 @@ func (w VirtualDiskSnapshotWatcher) enqueueRequests(ctx context.Context, vdSnaps
 		})
 	}
 
-	return
+	return requests
 }
 
 func isSnapshotDataSource(ds virtv2.ClusterVirtualImageDataSource, vdSnapshot metav1.Object) bool {

images/virtualization-artifact/pkg/controller/cvi/internal/watcher/virtualdisk_watcher.go

@@ -76,7 +76,7 @@ func (w *VirtualDiskWatcher) enqueueRequestsFromVDs(ctx context.Context, vd *vir
 	err := w.client.List(ctx, &cviList, &client.ListOptions{})
 	if err != nil {
 		slog.Default().Error(fmt.Sprintf("failed to list cvi: %s", err))
-		return
+		return requests
 	}
 
 	for _, cvi := range cviList.Items {
@@ -95,5 +95,5 @@ func (w *VirtualDiskWatcher) enqueueRequestsFromVDs(ctx context.Context, vd *vir
 		})
 	}
 
-	return
+	return requests
 }