From 7be30abab0b4d20b8b3198823925ecd1e9947923 Mon Sep 17 00:00:00 2001 From: Georges Chaudy Date: Tue, 21 Oct 2025 12:40:56 +0200 Subject: [PATCH] fix folder missing in the event key (#112698) --- pkg/storage/unified/resource/eventstore.go | 2 +- pkg/storage/unified/resource/eventstore_test.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/storage/unified/resource/eventstore.go b/pkg/storage/unified/resource/eventstore.go index 543849efe9f..04a35606f81 100644 --- a/pkg/storage/unified/resource/eventstore.go +++ b/pkg/storage/unified/resource/eventstore.go @@ -142,7 +142,7 @@ func (n *eventStore) Save(ctx context.Context, event Event) error { Name: event.Name, ResourceVersion: event.ResourceVersion, Action: event.Action, - //TODO why isnt folder part of the key? + Folder: event.Folder, } if err := eventKey.Validate(); err != nil { diff --git a/pkg/storage/unified/resource/eventstore_test.go b/pkg/storage/unified/resource/eventstore_test.go index c2b549f5e0c..b846536e864 100644 --- a/pkg/storage/unified/resource/eventstore_test.go +++ b/pkg/storage/unified/resource/eventstore_test.go @@ -206,6 +206,7 @@ func TestEventStore_Save_Get(t *testing.T) { Name: event.Name, ResourceVersion: event.ResourceVersion, Action: event.Action, + Folder: event.Folder, } retrievedEvent, err := store.Get(ctx, eventKey) @@ -518,6 +519,7 @@ func TestEventStore_CleanupOldEvents(t *testing.T) { Name: oldEvent.Name, ResourceVersion: oldEvent.ResourceVersion, Action: oldEvent.Action, + Folder: oldEvent.Folder, }) require.NoError(t, err) @@ -528,6 +530,7 @@ func TestEventStore_CleanupOldEvents(t *testing.T) { Name: recentEvent.Name, ResourceVersion: recentEvent.ResourceVersion, Action: recentEvent.Action, + Folder: recentEvent.Folder, }) require.NoError(t, err) @@ -555,6 +558,7 @@ func TestEventStore_CleanupOldEvents(t *testing.T) { Name: recentEvent.Name, ResourceVersion: recentEvent.ResourceVersion, Action: recentEvent.Action, + Folder: recentEvent.Folder, }) require.NoError(t, err, "Recent event should still exist") } @@ -592,6 +596,7 @@ func TestEventStore_CleanupOldEvents_NoOldEvents(t *testing.T) { Name: event.Name, ResourceVersion: event.ResourceVersion, Action: event.Action, + Folder: event.Folder, }) require.NoError(t, err, "Recent event should still exist") }