abstract bbolt from osquery extension code #1652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ating tests, fix inmemory kvstore Update bug
zackattack01
commented
Mar 13, 2024
| s.mu.Lock() | ||
| defer s.mu.Unlock() | ||
|
|
||
| s.items = make(map[string][]byte) |
There was a problem hiding this comment.
not sure how this was ever returning deleted keys
zackattack01
commented
Mar 13, 2024
| func (s *bboltKeyValueStore) ForEach(fn func(k, v []byte) error) error { | ||
| if s == nil || s.db == nil { | ||
| return NoDbError{} | ||
| } | ||
|
|
||
| return s.db.Update(func(tx *bbolt.Tx) error { | ||
| return s.db.View(func(tx *bbolt.Tx) error { |
There was a problem hiding this comment.
existing oversight, this should be read-only and in a View transaction
Closed
| func (s *bboltKeyValueStore) Count() int { | ||
| if s == nil || s.db == nil { | ||
| s.slogger.Log(context.TODO(), slog.LevelError, "unable to count uninitialized bbolt storage db") | ||
| return 0 |
There was a problem hiding this comment.
Safe to return 0 instead of 0, err in the error cases?
There was a problem hiding this comment.
I was on the fence about this, it seems safe for current uses but wondering if we'll regret this for the interface long term. I will update
RebeccaMahany
approved these changes
Mar 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Much credit for this PR goes to @James-Pickett - several ideas and some code have been stolen from the original here: #1421
Since that PR some of the original requirements have loosened and much code has shifted, making it easier to just start with a fresh branch here.
Follow up PRs will attempt to rip out all of the BBolt references from knapsack and beyond (wanted to keep the changeset smaller here). The concept here is to add two new interface requirements for the
KVStoretype to allow us to remove direct bbolt references from the osquery extension.go logic