Merge pull request #62 from kubescape/bugfix/watcher-resource

Adding fixed watcher

Author: amitschendel

pkg/watcher/watcher.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strconv"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -65,7 +66,7 @@ func (w *Watcher) Start(notifyF WatchNotifyFunctions, gvr schema.GroupVersionRes
 				return err
 			}
 			for i, item := range list.Items {
-				if item.GetResourceVersion() > resourceVersion {
+				if isResourceVersionHigher(item.GetResourceVersion(), resourceVersion) {
 					// Update the resourceVersion to the latest
 					resourceVersion = item.GetResourceVersion()
 					if w.preList {
@@ -127,7 +128,7 @@ func (w *Watcher) Start(notifyF WatchNotifyFunctions, gvr schema.GroupVersionRes
 					continue
 				}
 				// Update the resourceVersion
-				if addedObject.GetResourceVersion() > resourceVersion {
+				if isResourceVersionHigher(addedObject.GetResourceVersion(), resourceVersion) {
 					resourceVersion = addedObject.GetResourceVersion()
 				}
 				notifyF.AddFunc(addedObject)
@@ -140,7 +141,7 @@ func (w *Watcher) Start(notifyF WatchNotifyFunctions, gvr schema.GroupVersionRes
 					continue
 				}
 				// Update the resourceVersion
-				if modifiedObject.GetResourceVersion() > resourceVersion {
+				if isResourceVersionHigher(modifiedObject.GetResourceVersion(), resourceVersion) {
 					resourceVersion = modifiedObject.GetResourceVersion()
 				}
 				notifyF.UpdateFunc(modifiedObject)
@@ -153,7 +154,7 @@ func (w *Watcher) Start(notifyF WatchNotifyFunctions, gvr schema.GroupVersionRes
 					continue
 				}
 				// Update the resourceVersion
-				if deletedObject.GetResourceVersion() > resourceVersion {
+				if isResourceVersionHigher(deletedObject.GetResourceVersion(), resourceVersion) {
 					resourceVersion = deletedObject.GetResourceVersion()
 				}
 				notifyF.DeleteFunc(deletedObject)
@@ -177,3 +178,24 @@ func (w *Watcher) Stop() {
 
 func (w *Watcher) Destroy() {
 }
+
+func isResourceVersionHigher(resourceVersion string, currentResourceVersion string) bool {
+	// If the currentResourceVersion is empty, return true
+	if currentResourceVersion == "" {
+		return true
+	}
+
+	// Convert the resourceVersion to int64
+	resourceVersionInt, err := strconv.ParseInt(resourceVersion, 10, 64)
+	if err != nil {
+		return false
+	}
+
+	// Convert the currentResourceVersion to int64
+	currentResourceVersionInt, err := strconv.ParseInt(currentResourceVersion, 10, 64)
+	if err != nil {
+		return false
+	}
+
+	return resourceVersionInt > currentResourceVersionInt
+}

pkg/watcher/watcher_test.go

@@ -81,3 +81,64 @@ func TestWatcherBasic(t *testing.T) {
 		t.Errorf("DeleteFunc called %d times, expected 1", numberOfDeleteFuncCalls)
 	}
 }
+
+func TestIsResourceVersionHigher(t *testing.T) {
+	tests := []struct {
+		name                   string
+		resourceVersion        string
+		currentResourceVersion string
+		expectedResult         bool
+	}{
+		{
+			name:                   "Empty currentResourceVersion",
+			resourceVersion:        "123",
+			currentResourceVersion: "",
+			expectedResult:         true,
+		},
+		{
+			name:                   "Valid resourceVersion and currentResourceVersion",
+			resourceVersion:        "456",
+			currentResourceVersion: "123",
+			expectedResult:         true,
+		},
+		{
+			name:                   "Invalid resourceVersion",
+			resourceVersion:        "abc",
+			currentResourceVersion: "123",
+			expectedResult:         false,
+		},
+		{
+			name:                   "Invalid currentResourceVersion",
+			resourceVersion:        "456",
+			currentResourceVersion: "def",
+			expectedResult:         false,
+		},
+		{
+			name:                   "Equal resourceVersion and currentResourceVersion",
+			resourceVersion:        "456",
+			currentResourceVersion: "456",
+			expectedResult:         false,
+		},
+		{
+			name:                   "currentResourceVersion higher then resourceVersion",
+			resourceVersion:        "123",
+			currentResourceVersion: "456",
+			expectedResult:         false,
+		},
+		{
+			name:                   "Valid resourceVersion and currentResourceVersion high numbers",
+			resourceVersion:        "1234567892",
+			currentResourceVersion: "1234567891",
+			expectedResult:         true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			result := isResourceVersionHigher(test.resourceVersion, test.currentResourceVersion)
+			if result != test.expectedResult {
+				t.Errorf("Expected %v, but got %v", test.expectedResult, result)
+			}
+		})
+	}
+}