Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create event when entry is pruned #4860

Merged
merged 11 commits into from
Feb 14, 2024
Merged

Create event when entry is pruned #4860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d2dacb3
Create event when entry is pruned
faisal-memon Feb 1, 2024
9da8bc9
Set a default admin socket path for spire-agent cli use (#4856)
kfox1111 Feb 2, 2024
4c11b34
Bump github.com/mattn/go-sqlite3 from 1.14.21 to 1.14.22 (#4861)
dependabot[bot] Feb 2, 2024
99d4272
Do not use read-replicas for initial events-based cache load (#4868)
azdagron Feb 6, 2024
87af3a8
Bump github.com/sigstore/rekor from 1.3.4 to 1.3.5 (#4864)
dependabot[bot] Feb 7, 2024
59e5680
Bump the azure-sdk group with 1 update (#4869)
dependabot[bot] Feb 7, 2024
8f211bb
Bump google.golang.org/api from 0.161.0 to 0.162.0 (#4870)
dependabot[bot] Feb 7, 2024
ed1eb07
No longer emit x509UniqueIdentifier in X509-SVIDs (#4862)
azdagron Feb 7, 2024
3607ff2
Make reattest to renew default behaviour (#4791)
faisal-memon Feb 7, 2024
1dbb33b
Update unit test
faisal-memon Feb 7, 2024
d7a0e8e
Merge branch 'main' into prune
evan2645 Feb 13, 2024
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
3 changes: 3 additions & 0 deletions pkg/server/datastore/sqlstore/sqlstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3818,6 +3818,9 @@ func pruneRegistrationEntries(tx *gorm.DB, expiresBefore time.Time, logger logru
if err := deleteRegistrationEntrySupport(tx, entry); err != nil {
return err
}
if err := createRegistrationEntryEvent(tx, entry.EntryID); err != nil {
faisal-memon marked this conversation as resolved.
Show resolved Hide resolved
return err
}
logger.WithFields(logrus.Fields{
telemetry.SPIFFEID: entry.SpiffeID,
telemetry.ParentID: entry.ParentID,
Expand Down
20 changes: 20 additions & 0 deletions pkg/server/datastore/sqlstore/sqlstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,11 @@ func (s *PluginSuite) TestPruneRegistrationEntries() {
}
prunedLogMessage := "Pruned an expired registration"

resp, err := s.ds.ListRegistrationEntriesEvents(ctx, &datastore.ListRegistrationEntriesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(1, len(resp.Events))
s.Require().Equal(createdRegistrationEntry.EntryId, resp.Events[0].EntryID)

for _, tt := range []struct {
name string
time time.Time
Expand Down Expand Up @@ -2082,12 +2087,27 @@ func (s *PluginSuite) TestPruneRegistrationEntries() {
} {
tt := tt
s.T().Run(tt.name, func(t *testing.T) {
lastEventID, err := s.ds.GetLatestRegistrationEntryEventID(ctx)
require.NoError(t, err)

err = s.ds.PruneRegistrationEntries(ctx, tt.time)
require.NoError(t, err)
fetchedRegistrationEntry, err = s.ds.FetchRegistrationEntry(ctx, createdRegistrationEntry.EntryId)
require.NoError(t, err)
assert.Equal(t, tt.expectedRegistrationEntry, fetchedRegistrationEntry)

// Verify pruning triggers event creation
resp, err := s.ds.ListRegistrationEntriesEvents(ctx, &datastore.ListRegistrationEntriesEventsRequest{
GreaterThanEventID: lastEventID,
})
require.NoError(t, err)
if tt.expectedRegistrationEntry != nil {
require.Equal(t, 0, len(resp.Events))
} else {
require.Equal(t, 1, len(resp.Events))
require.Equal(t, createdRegistrationEntry.EntryId, resp.Events[0].EntryID)
}

if tt.expectedLastLog.Message == prunedLogMessage {
spiretest.AssertLastLogs(t, s.hook.AllEntries(), []spiretest.LogEntry{tt.expectedLastLog})
} else {
Expand Down
Loading