Involve since_time for collect-sub entry getting. (#1049)

* Involve `since_time` for collect-sub entry getting.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

* Correct lint warning of decl and defn.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

* Update the protobuf files.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

* Jostle the .proto correctly instead of editing the generated file.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

* Rename `AsOf` into `SinceTime` for consistency.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

---------

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>

pkg/collectsub/client/mock.go

@@ -45,5 +45,5 @@ func (c *MockClient) AddCollectEntries(ctx context.Context, entries []*pb.Collec
 }
 
 func (c *MockClient) GetCollectEntries(ctx context.Context, filters []*pb.CollectEntryFilter) ([]*pb.CollectEntry, error) {
-	return c.db.GetCollectEntries(ctx, filters)
+	return c.db.GetCollectEntries(ctx, filters, 0)
 }

pkg/collectsub/collectsub/collectsub.proto

@@ -30,6 +30,7 @@ enum CollectDataType {
 message CollectEntry {
     CollectDataType type = 1;
     string value = 2;
+    int64 since_time = 3;
 }
 
 // rpc AddCollectEntry

pkg/collectsub/server/db/db_test.go

@@ -150,7 +150,7 @@ type testCall func(ctx context.Context, db types.CollectSubscriberDb) error
 
 func getFn(filters []*pb.CollectEntryFilter, expectErr bool, expect []*pb.CollectEntry) testCall {
 	return func(ctx context.Context, db types.CollectSubscriberDb) error {
-		entries, err := db.GetCollectEntries(ctx, filters)
+		entries, err := db.GetCollectEntries(ctx, filters, 0)
 		if err != nil != expectErr {
 			return fmt.Errorf("expected err status %v, got %v", expectErr, err != nil)
 		}

pkg/collectsub/server/db/simpledb/simpledb.go

@@ -18,6 +18,7 @@ package simpledb
 import (
 	"context"
 	"sync"
+	"time"
 
 	"github.com/gobwas/glob"
 	pb "github.com/guacsec/guac/pkg/collectsub/collectsub"
@@ -52,15 +53,17 @@ func (s *simpleDb) containsEntry(e *pb.CollectEntry) bool {
 func (s *simpleDb) AddCollectEntries(ctx context.Context, entries []*pb.CollectEntry) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
+	var sinceTime = time.Now().Unix()
 	for _, e := range entries {
 		if e != nil && !s.containsEntry(e) {
+			e.SinceTime = sinceTime
 			s.collectEntries = append(s.collectEntries, e)
 		}
 	}
 	return nil
 }
 
-func (s *simpleDb) GetCollectEntries(ctx context.Context, filters []*pb.CollectEntryFilter) ([]*pb.CollectEntry, error) {
+func (s *simpleDb) GetCollectEntries(ctx context.Context, filters []*pb.CollectEntryFilter, sinceTime int64) ([]*pb.CollectEntry, error) {
 	s.lock.RLock()
 	defer s.lock.RUnlock()
 	var filterMatchers []glob.Glob
@@ -70,11 +73,13 @@ func (s *simpleDb) GetCollectEntries(ctx context.Context, filters []*pb.CollectE
 
 	var retList []*pb.CollectEntry
 	for _, e := range s.collectEntries {
-		for i, f := range filters {
-			matched := filterMatchers[i].Match(e.Value)
-			if e.Type == f.Type && matched {
-				retList = append(retList, e)
-				break
+		if e.SinceTime >= sinceTime {
+			for i, f := range filters {
+				matched := filterMatchers[i].Match(e.Value)
+				if e.Type == f.Type && matched {
+					retList = append(retList, e)
+					break
+				}
 			}
 		}
 	}

pkg/collectsub/server/db/types/db.go

@@ -23,5 +23,5 @@ import (
 
 type CollectSubscriberDb interface {
 	AddCollectEntries(context.Context, []*pb.CollectEntry) error
-	GetCollectEntries(context.Context, []*pb.CollectEntryFilter) ([]*pb.CollectEntry, error)
+	GetCollectEntries(context.Context, []*pb.CollectEntryFilter, int64) ([]*pb.CollectEntry, error)
 }

pkg/collectsub/server/server.go

@@ -67,7 +67,7 @@ func (s *server) GetCollectEntries(ctx context.Context, in *pb.GetCollectEntries
 	logger := logging.FromContext(ctx)
 	logger.Infof("GetCollectEntries called with filters: %v", in.Filters)
 
-	ret, err := s.Db.GetCollectEntries(ctx, in.Filters)
+	ret, err := s.Db.GetCollectEntries(ctx, in.Filters, in.SinceTime)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get collect entries from db: %w", err)
 	}