Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions storeutils/host/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (s *Store[E]) Update(_ context.Context, obj E) (E, error) {
}

if obj.GetDeletedAt() != nil && len(obj.GetFinalizers()) == 0 {
if err := s.delete(obj.GetID()); err != nil {
if err := s.delete(obj); err != nil {
return utils.Zero[E](), fmt.Errorf("failed to delete object metadata: %w", err)
}
return obj, nil
Expand Down Expand Up @@ -169,7 +169,7 @@ func (s *Store[E]) Delete(_ context.Context, id string) error {
}

if len(obj.GetFinalizers()) == 0 {
return s.delete(id)
return s.delete(obj)
}

if obj.GetDeletedAt() != nil {
Expand Down Expand Up @@ -261,11 +261,16 @@ func (s *Store[E]) set(obj E) (E, error) {
return obj, nil
}

func (s *Store[E]) delete(id string) error {
if err := os.Remove(filepath.Join(s.dir, id)); err != nil {
func (s *Store[E]) delete(obj E) error {
if err := os.Remove(filepath.Join(s.dir, obj.GetID())); err != nil {
return fmt.Errorf("failed to delete object from store: %w", err)
}

s.enqueue(store.WatchEvent[E]{
Type: store.WatchEventTypeDeleted,
Object: obj,
})

return nil
}

Expand Down
Loading