Skip to content

Commit

Permalink
Emit events when Node Selectrs are set (#5037)
Browse files Browse the repository at this point in the history 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
Co-authored-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
  • Loading branch information
@faisal-memon @amartinezfayo
faisal-memon and amartinezfayo authored Apr 9, 2024
1 parent 7872525 commit 5eefa54
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 43 deletions.
6 changes: 4 additions & 2 deletions pkg/server/datastore/sqlstore/sqlstore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,10 @@ func (ds *Plugin) GetLatestAttestedNodeEventID(ctx context.Context) (eventID uin
// SetNodeSelectors sets node (agent) selectors by SPIFFE ID, deleting old selectors first
func (ds *Plugin) SetNodeSelectors(ctx context.Context, spiffeID string, selectors []*common.Selector) (err error) {
return ds.withWriteTx(ctx, func(tx *gorm.DB) (err error) {
err = setNodeSelectors(tx, spiffeID, selectors)
return err
if err = setNodeSelectors(tx, spiffeID, selectors); err != nil {
return err
}
return createAttestedNodeEvent(tx, spiffeID)
})
}

Expand Down
88 changes: 47 additions & 41 deletions pkg/server/datastore/sqlstore/sqlstore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,6 @@ func (s *PluginSuite) TestDeleteAttestedNode() {

func (s *PluginSuite) TestListAttestedNodesEvents() {
var expectedEvents []datastore.AttestedNodeEvent
var expectedEventID uint = 1

// Create an attested node
node1, err := s.ds.CreateAttestedNode(ctx, &common.AttestedNode{
Expand All @@ -1489,15 +1488,14 @@ func (s *PluginSuite) TestListAttestedNodesEvents() {
CertNotAfter: time.Now().Add(time.Hour).Unix(),
})
s.Require().NoError(err)
expectedEvents = append(expectedEvents, datastore.AttestedNodeEvent{
EventID: expectedEventID,
SpiffeID: node1.SpiffeId,
})
expectedEventID++
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, node1.SpiffeId)

resp, err := s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(expectedEvents, resp.Events)
// Create selectors for attested node
selectors1 := []*common.Selector{
{Type: "FOO1", Value: "1"},
}
s.setNodeSelectors(node1.SpiffeId, selectors1)
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, node1.SpiffeId)

// Create second attested node
node2, err := s.ds.CreateAttestedNode(ctx, &common.AttestedNode{
Expand All @@ -1507,40 +1505,35 @@ func (s *PluginSuite) TestListAttestedNodesEvents() {
CertNotAfter: time.Now().Add(time.Hour).Unix(),
})
s.Require().NoError(err)
expectedEvents = append(expectedEvents, datastore.AttestedNodeEvent{
EventID: expectedEventID,
SpiffeID: node2.SpiffeId,
})
expectedEventID++
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, node2.SpiffeId)

resp, err = s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(expectedEvents, resp.Events)
// Create selectors for second attested node
selectors2 := []*common.Selector{
{Type: "BAR1", Value: "1"},
}
s.setNodeSelectors(node2.SpiffeId, selectors2)
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, node2.SpiffeId)

// Update first attested node
updatedNode, err := s.ds.UpdateAttestedNode(ctx, node1, nil)
s.Require().NoError(err)
expectedEvents = append(expectedEvents, datastore.AttestedNodeEvent{
EventID: expectedEventID,
SpiffeID: updatedNode.SpiffeId,
})
expectedEventID++
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, updatedNode.SpiffeId)

resp, err = s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(expectedEvents, resp.Events)
// Update selectors for first attested node
updatedSelectors := []*common.Selector{
{Type: "FOO2", Value: "2"},
}
s.setNodeSelectors(updatedNode.SpiffeId, updatedSelectors)
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, updatedNode.SpiffeId)

// Delete second atttested node
deletedNode, err := s.ds.DeleteAttestedNode(ctx, node2.SpiffeId)
s.Require().NoError(err)
expectedEvents = append(expectedEvents, datastore.AttestedNodeEvent{
EventID: expectedEventID,
SpiffeID: deletedNode.SpiffeId,
})
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, deletedNode.SpiffeId)

resp, err = s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(expectedEvents, resp.Events)
// Delete selectors for second attested node
s.setNodeSelectors(deletedNode.SpiffeId, nil)
expectedEvents = s.checkAttestedNodeEvents(expectedEvents, deletedNode.SpiffeId)

// Check filtering events by id
tests := []struct {
Expand All @@ -1557,32 +1550,32 @@ func (s *PluginSuite) TestListAttestedNodesEvents() {
},
{
name: "Half of the Events",
greaterThanEventID: 2,
expectedFirstEventID: 3,
expectedEvents: expectedEvents[2:],
greaterThanEventID: uint(len(expectedEvents) / 2),
expectedFirstEventID: uint(len(expectedEvents)/2) + 1,
expectedEvents: expectedEvents[len(expectedEvents)/2:],
},
{
name: "None of the Events",
greaterThanEventID: 4,
greaterThanEventID: uint(len(expectedEvents)),
expectedFirstEventID: 0,
expectedEvents: []datastore.AttestedNodeEvent{},
},
}
for _, test := range tests {
s.T().Run(test.name, func(t *testing.T) {
resp, err = s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{
resp, err := s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{
GreaterThanEventID: test.greaterThanEventID,
})
s.Require().NoError(err)
s.Require().Equal(test.expectedFirstEventID, resp.FirstEventID)
s.Require().Equal(test.expectedEvents, resp.Events)
s.Assert().NoError(err)
s.Assert().Equal(test.expectedFirstEventID, resp.FirstEventID)
s.Assert().Equal(test.expectedEvents, resp.Events)
})
}

// Check we can get the last event id
lastEventID, err := s.ds.GetLatestAttestedNodeEventID(ctx)
s.Require().NoError(err)
s.Require().Equal(expectedEventID, lastEventID)
s.Require().Equal(uint(len(expectedEvents)), lastEventID)
}

func (s *PluginSuite) TestPruneAttestedNodesEvents() {
Expand Down Expand Up @@ -5227,6 +5220,19 @@ func (s *PluginSuite) assertCreatedAtField(entry *common.RegistrationEntry, now
entry.CreatedAt = 0
}

func (s *PluginSuite) checkAttestedNodeEvents(expectedEvents []datastore.AttestedNodeEvent, spiffeID string) []datastore.AttestedNodeEvent {
expectedEvents = append(expectedEvents, datastore.AttestedNodeEvent{
EventID: uint(len(expectedEvents) + 1),
SpiffeID: spiffeID,
})

resp, err := s.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{})
s.Require().NoError(err)
s.Require().Equal(expectedEvents, resp.Events)

return expectedEvents
}

// assertBundlesEqual asserts that the two bundle lists are equal independent
// of ordering.
func assertBundlesEqual(t *testing.T, expected, actual []*common.Bundle) {
Expand Down

0 comments on commit 5eefa54

Please sign in to comment.