Merge pull request #463 from kubescape/norun

fix object cache when runtime observability is disabled
kubescape · Jan 22, 2025 · 8f6f8b7 · 8f6f8b7
2 parents 3b01650 + 7495bff
commit 8f6f8b7
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 11 deletions.
diff --git a/main.go b/main.go
@@ -250,7 +250,10 @@ func main() {
 
 	} else {
 		ruleManager = rulemanager.CreateRuleManagerMock()
-		objCache = objectcache.NewObjectCacheMock()
+		apc := &objectcache.ApplicationProfileCacheMock{}
+		nnc := &objectcache.NetworkNeighborhoodCacheMock{}
+		dc := &objectcache.DnsCacheMock{}
+		objCache = objectcachev1.NewObjectCache(k8sObjectCache, apc, nnc, dc)
 		ruleBindingNotify = make(chan rulebinding.RuleBindingNotify, 1)
 		processManager = processmanager.CreateProcessManagerMock()
 	}

diff --git a/pkg/objectcache/applicationprofilecache_interface.go b/pkg/objectcache/applicationprofilecache_interface.go
@@ -1,9 +1,19 @@
 package objectcache
 
-import "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
+import (
+	"context"
+
+	"github.com/kubescape/node-agent/pkg/watcher"
+	"github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
 
 type ApplicationProfileCache interface {
 	GetApplicationProfile(containerID string) *v1beta1.ApplicationProfile
+	WatchResources() []watcher.WatchResource
+	AddHandler(ctx context.Context, obj runtime.Object)
+	ModifyHandler(ctx context.Context, obj runtime.Object)
+	DeleteHandler(ctx context.Context, obj runtime.Object)
 }
 
 var _ ApplicationProfileCache = (*ApplicationProfileCacheMock)(nil)
@@ -14,3 +24,19 @@ type ApplicationProfileCacheMock struct {
 func (ap *ApplicationProfileCacheMock) GetApplicationProfile(_ string) *v1beta1.ApplicationProfile {
 	return nil
 }
+
+func (ap *ApplicationProfileCacheMock) WatchResources() []watcher.WatchResource {
+	return nil
+}
+
+func (ap *ApplicationProfileCacheMock) AddHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (ap *ApplicationProfileCacheMock) ModifyHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (ap *ApplicationProfileCacheMock) DeleteHandler(_ context.Context, _ runtime.Object) {
+	return
+}
diff --git a/pkg/objectcache/networkneighborhoodcache_interface.go b/pkg/objectcache/networkneighborhoodcache_interface.go
@@ -1,9 +1,19 @@
 package objectcache
 
-import "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
+import (
+	"context"
+
+	"github.com/kubescape/node-agent/pkg/watcher"
+	"github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
 
 type NetworkNeighborhoodCache interface {
 	GetNetworkNeighborhood(containerID string) *v1beta1.NetworkNeighborhood
+	WatchResources() []watcher.WatchResource
+	AddHandler(ctx context.Context, obj runtime.Object)
+	ModifyHandler(ctx context.Context, obj runtime.Object)
+	DeleteHandler(ctx context.Context, obj runtime.Object)
 }
 
 var _ NetworkNeighborhoodCache = (*NetworkNeighborhoodCacheMock)(nil)
@@ -14,3 +24,19 @@ type NetworkNeighborhoodCacheMock struct {
 func (ap *NetworkNeighborhoodCacheMock) GetNetworkNeighborhood(_ string) *v1beta1.NetworkNeighborhood {
 	return nil
 }
+
+func (ap *NetworkNeighborhoodCacheMock) WatchResources() []watcher.WatchResource {
+	return nil
+}
+
+func (ap *NetworkNeighborhoodCacheMock) AddHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (ap *NetworkNeighborhoodCacheMock) ModifyHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (ap *NetworkNeighborhoodCacheMock) DeleteHandler(_ context.Context, _ runtime.Object) {
+	return
+}
diff --git a/pkg/ruleengine/v1/mock.go b/pkg/ruleengine/v1/mock.go
@@ -1,13 +1,15 @@
 package ruleengine
 
 import (
-	corev1 "k8s.io/api/core/v1"
+	"context"
 
 	"github.com/goradd/maps"
 	"github.com/kubescape/node-agent/pkg/objectcache"
 	"github.com/kubescape/node-agent/pkg/utils"
-
+	"github.com/kubescape/node-agent/pkg/watcher"
 	"github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var _ objectcache.ApplicationProfileCache = (*RuleObjectCacheMock)(nil)
@@ -62,18 +64,18 @@ func (r *RuleObjectCacheMock) GetPods() []*corev1.Pod {
 	return []*corev1.Pod{{Spec: *r.podSpec, Status: *r.podStatus}}
 }
 
-func (k *RuleObjectCacheMock) SetSharedContainerData(containerID string, data *utils.WatchedContainerData) {
-	k.containerIDToSharedData.Set(containerID, data)
+func (r *RuleObjectCacheMock) SetSharedContainerData(containerID string, data *utils.WatchedContainerData) {
+	r.containerIDToSharedData.Set(containerID, data)
 }
-func (k *RuleObjectCacheMock) GetSharedContainerData(containerID string) *utils.WatchedContainerData {
-	if data, ok := k.containerIDToSharedData.Load(containerID); ok {
+func (r *RuleObjectCacheMock) GetSharedContainerData(containerID string) *utils.WatchedContainerData {
+	if data, ok := r.containerIDToSharedData.Load(containerID); ok {
 		return data
 	}
 
 	return nil
 }
-func (k *RuleObjectCacheMock) DeleteSharedContainerData(containerID string) {
-	k.containerIDToSharedData.Delete(containerID)
+func (r *RuleObjectCacheMock) DeleteSharedContainerData(containerID string) {
+	r.containerIDToSharedData.Delete(containerID)
 }
 
 func (r *RuleObjectCacheMock) K8sObjectCache() objectcache.K8sObjectCache {
@@ -107,3 +109,19 @@ func (r *RuleObjectCacheMock) ResolveIpToDomain(ip string) string {
 
 	return ""
 }
+
+func (r *RuleObjectCacheMock) WatchResources() []watcher.WatchResource {
+	return nil
+}
+
+func (r *RuleObjectCacheMock) AddHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (r *RuleObjectCacheMock) ModifyHandler(_ context.Context, _ runtime.Object) {
+	return
+}
+
+func (r *RuleObjectCacheMock) DeleteHandler(_ context.Context, _ runtime.Object) {
+	return
+}