Saving work off so I can switch machines.

Signed-off-by: Edwin Buck <edwbuck@gmail.com>
spiffe · Sep 25, 2024 · f81942f · f81942f
1 parent bf6ad3c
commit f81942f
Show file tree

Hide file tree

Showing 4 changed files with 620 additions and 39 deletions.
diff --git a/pkg/server/datastore/sqlstore/sqlstore.go b/pkg/server/datastore/sqlstore/sqlstore.go
@@ -353,6 +353,8 @@ func (ds *Plugin) UpdateAttestedNode(ctx context.Context, n *common.AttestedNode
  if err != nil {
  return err
  }
+ // TODO: this is at the wrong level of the software stack.
+ // It should be created in the caller of the datastore interface.
  return createAttestedNodeEvent(tx, &datastore.AttestedNodeEvent{
  SpiffeID: n.SpiffeId,
  })
@@ -369,6 +371,8 @@ func (ds *Plugin) DeleteAttestedNode(ctx context.Context, spiffeID string) (atte
  if err != nil {
  return err
  }
+ // TODO: this is at the wrong level of the software stack.
+ // It should be created in the caller of the datastore interface.
  return createAttestedNodeEvent(tx, &datastore.AttestedNodeEvent{
  SpiffeID: spiffeID,
  })

diff --git a/pkg/server/endpoints/authorized_entryfetcher_attested_nodes.go b/pkg/server/endpoints/authorized_entryfetcher_attested_nodes.go
@@ -56,7 +56,7 @@ func (a *attestedNodes) captureChangedNodes(ctx context.Context) error {
 
 func (a *attestedNodes) searchBeforeFirstEvent(ctx context.Context) error {
  // First event detected, and startup was less than a transaction timout away.
- if !a.firstEventTime.IsZero() && a.clk.Now().Sub(a.firstEventTime) > a.sqlTransactionTimeout {
+ if !a.firstEventTime.IsZero() && a.clk.Now().Sub(a.firstEventTime) <= a.sqlTransactionTimeout {
  resp, err := a.ds.ListAttestedNodesEvents(ctx, &datastore.ListAttestedNodesEventsRequest{
  LessThanEventID: a.firstEvent,
  })
@@ -230,6 +230,7 @@ func (a *attestedNodes) updateCachedNodes(ctx context.Context) error {
 
  agentExpiresAt := time.Unix(node.CertNotAfter, 0)
  a.cache.UpdateAgent(node.SpiffeId, agentExpiresAt, api.ProtoFromSelectors(node.Selectors))
+ delete(a.fetchNodes, node.SpiffeId)
 
  }
  a.emitCacheMetrics()