Add eventsBasedCache parameter to fakedatastore

Signed-off-by: Sorin Dumitru <sdumitru@bloomberg.net>
sorindumitru · Jan 17, 2024 · 838eaf2 · 838eaf2
1 parent ce7efce
commit 838eaf2
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 51 deletions.
diff --git a/pkg/server/api/agent/v1/service_test.go b/pkg/server/api/agent/v1/service_test.go
@@ -3189,7 +3189,7 @@ func setupServiceTest(t *testing.T, agentSVIDTTL time.Duration) *serviceTest {
 	ca := fakeserverca.New(t, td, &fakeserverca.Options{
 		AgentSVIDTTL: agentSVIDTTL,
 	})
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	cat := fakeservercatalog.New()
 	clk := clock.NewMock(t)
 

diff --git a/pkg/server/api/bundle/v1/service_test.go b/pkg/server/api/bundle/v1/service_test.go
@@ -2894,7 +2894,7 @@ func (c *serviceTest) Cleanup() {
 }
 
 func setupServiceTest(t *testing.T) *serviceTest {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	up := new(fakeUpstreamPublisher)
 	rateLimiter := new(fakeRateLimiter)
 	service := bundle.New(bundle.Config{

diff --git a/pkg/server/api/debug/v1/service_test.go b/pkg/server/api/debug/v1/service_test.go
@@ -439,7 +439,7 @@ func (s *serviceTest) Cleanup() {
 
 func setupServiceTest(t *testing.T) *serviceTest {
 	clk := clock.NewMock()
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	log, logHook := test.NewNullLogger()
 	log.Level = logrus.DebugLevel
 	fakeUptime := &fakeUptime{

diff --git a/pkg/server/api/entry/v1/service_test.go b/pkg/server/api/entry/v1/service_test.go
@@ -142,7 +142,7 @@ func TestCountEntries(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			test := setupServiceTest(t, ds)
 			defer test.Cleanup()
 
@@ -221,7 +221,7 @@ func TestListEntries(t *testing.T) {
 	}
 
 	// setup
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	test := setupServiceTest(t, ds)
 	defer test.Cleanup()
 
@@ -1219,7 +1219,7 @@ func TestListEntries(t *testing.T) {
 
 func TestGetEntry(t *testing.T) {
 	now := time.Now().Unix()
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	test := setupServiceTest(t, ds)
 	defer test.Cleanup()
 
@@ -2652,7 +2652,7 @@ func TestBatchDeleteEntry(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			test := setupServiceTest(t, ds)
 			defer test.Cleanup()
 
@@ -2869,7 +2869,7 @@ func TestGetAuthorizedEntries(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			test := setupServiceTest(t, fakedatastore.New(t))
+			test := setupServiceTest(t, fakedatastore.New(t, false))
 			defer test.Cleanup()
 
 			test.omitCallerID = tt.failCallerID
@@ -3266,7 +3266,7 @@ func TestSyncAuthorizedEntries(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			test := setupServiceTest(t, fakedatastore.New(t))
+			test := setupServiceTest(t, fakedatastore.New(t, false))
 			defer func() {
 				test.Cleanup()
 				spiretest.AssertLogs(t, test.logHook.AllEntries(), tt.expectLogs)
@@ -3346,7 +3346,7 @@ func FuzzSyncAuthorizedStreams(f *testing.F) {
 
 		entries := entries[:totalEntries]
 
-		test := setupServiceTest(t, fakedatastore.New(t), withEntryPageSize(entryPageSize))
+		test := setupServiceTest(t, fakedatastore.New(t, false), withEntryPageSize(entryPageSize))
 		defer test.Cleanup()
 		test.ef.entries = entries
 
@@ -4598,7 +4598,7 @@ func TestBatchUpdateEntry(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			test := setupServiceTest(t, ds)
 			defer test.Cleanup()
 			// Create federated bundles, that we use on "FederatesWith"
@@ -4798,7 +4798,7 @@ type fakeDS struct {
 
 func newFakeDS(t *testing.T) *fakeDS {
 	return &fakeDS{
-		DataStore:     fakedatastore.New(t),
+		DataStore:     fakedatastore.New(t, false),
 		expectEntries: make(map[string]*common.RegistrationEntry),
 		results:       make(map[string]*common.RegistrationEntry),
 	}

diff --git a/pkg/server/api/health/v1/service_test.go b/pkg/server/api/health/v1/service_test.go
@@ -89,7 +89,7 @@ func TestServiceCheck(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			log, logHook := test.NewNullLogger()
 
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			if tt.dsErr != nil {
 				ds.SetNextError(tt.dsErr)
 			}

diff --git a/pkg/server/api/localauthority/v1/service_test.go b/pkg/server/api/localauthority/v1/service_test.go
@@ -1785,7 +1785,7 @@ func TestRevokeX509Authority(t *testing.T) {
 }
 
 func setupServiceTest(t *testing.T) *serviceTest {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	m := &fakeCAManager{}
 
 	service := localauthority.New(localauthority.Config{

diff --git a/pkg/server/api/svid/v1/service_test.go b/pkg/server/api/svid/v1/service_test.go
@@ -2077,7 +2077,7 @@ func setupServiceTest(t *testing.T) *serviceTest {
 	ca := fakeserverca.New(t, trustDomain, &fakeserverca.Options{})
 	ef := &entryFetcher{}
 	downstream := &entryFetcher{}
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 
 	rateLimiter := &fakeRateLimiter{}
 	service := svid.New(svid.Config{

diff --git a/pkg/server/api/trustdomain/v1/service_test.go b/pkg/server/api/trustdomain/v1/service_test.go
@@ -1297,7 +1297,7 @@ func TestBatchDeleteFederationRelationship(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			test := setupServiceTest(t, ds)
 			defer test.Cleanup()
 
@@ -2133,7 +2133,7 @@ func TestRefreshBundle(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			test := setupServiceTest(t, fakedatastore.New(t))
+			test := setupServiceTest(t, fakedatastore.New(t, false))
 			defer test.Cleanup()
 
 			_, err := test.client.RefreshBundle(ctx, &trustdomainv1.RefreshBundleRequest{
@@ -2237,7 +2237,7 @@ type fakeDS struct {
 
 func newFakeDS(t *testing.T) *fakeDS {
 	return &fakeDS{
-		DataStore: fakedatastore.New(t),
+		DataStore: fakedatastore.New(t, false),
 	}
 }
 

diff --git a/pkg/server/bundle/client/manager_test.go b/pkg/server/bundle/client/manager_test.go
@@ -265,7 +265,7 @@ func newManagerTest(t *testing.T, source TrustDomainConfigSource, localBundles,
 	test.manager = NewManager(ManagerConfig{
 		Log:               log,
 		Metrics:           telemetry.Blackhole{},
-		DataStore:         fakedatastore.New(t),
+		DataStore:         fakedatastore.New(t, false),
 		Clock:             test.clock,
 		Source:            source,
 		newBundleUpdater:  test.newBundleUpdater,

diff --git a/pkg/server/bundle/client/updater_test.go b/pkg/server/bundle/client/updater_test.go
@@ -83,7 +83,7 @@ func TestBundleUpdaterUpdateBundle(t *testing.T) {
 	for _, testCase := range testCases {
 		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 
 			if testCase.localBundle != nil {
 				localBundleProto, err := bundleutil.SPIFFEBundleToProto(testCase.localBundle)

diff --git a/pkg/server/bundle/datastore/wrapper_test.go b/pkg/server/bundle/datastore/wrapper_test.go
@@ -79,7 +79,7 @@ func TestWithBundlePublisher(t *testing.T) {
 		tt := tt
 		ctx := context.Background()
 		t.Run(tt.name, func(t *testing.T) {
-			var ds datastore.DataStore = fakedatastore.New(t)
+			var ds datastore.DataStore = fakedatastore.New(t, false)
 
 			// We want to have at least two JWT signing keys so one can be
 			// pruned.

diff --git a/pkg/server/bundle/pubmanager/pubmanager_test.go b/pkg/server/bundle/pubmanager/pubmanager_test.go
@@ -253,7 +253,7 @@ func (p *fakeBundlePublisher) Type() string {
 func setupTest(t *testing.T, bundlePublishers []bundlepublisher.BundlePublisher) *managerTest {
 	log, logHook := test.NewNullLogger()
 	log.Level = logrus.DebugLevel
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 
 	clock := clock.NewMock(t)
 	m, err := newManager(&ManagerConfig{

diff --git a/pkg/server/ca/manager/journal_test.go b/pkg/server/ca/manager/journal_test.go
@@ -51,7 +51,7 @@ func setupJournalTest(t *testing.T) *journalTest {
 	})
 	require.NoError(t, err)
 
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	cat := fakeservercatalog.New()
 	cat.SetDataStore(ds)
 
@@ -137,7 +137,7 @@ func TestJournalPersistence(t *testing.T) {
 	// Test for the case when SPIRE starts with a CA journal on disk and does
 	// not yet have a CA journal stored in the datastore. Reset the datastore so
 	// we only have the CA journal on disk.
-	test.ds = fakedatastore.New(t)
+	test.ds = fakedatastore.New(t, false)
 	test.jc.cat.(*fakeservercatalog.Catalog).SetDataStore(test.ds)
 
 	// Load the journal again. It should still get the CA journal stored on

diff --git a/pkg/server/ca/manager/manager_test.go b/pkg/server/ca/manager/manager_test.go
@@ -696,7 +696,7 @@ func TestPruneCAJournals(t *testing.T) {
 		expectedCAJournals = []*datastore.CAJournal{}
 		t.Run(testCase.name, func(t *testing.T) {
 			// Have a fresh data store in each test case
-			test.ds = fakedatastore.New(t)
+			test.ds = fakedatastore.New(t, false)
 			test.m.c.Catalog.(*fakeservercatalog.Catalog).SetDataStore(test.ds)
 
 			for _, j := range testCase.testJournals {
@@ -982,7 +982,7 @@ func setupTest(t *testing.T) *managerTest {
 	log, logHook := test.NewNullLogger()
 	metrics := fakemetrics.New()
 	km := fakeserverkeymanager.New(t)
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 
 	cat := fakeservercatalog.New()
 	cat.SetKeyManager(km)
@@ -1221,7 +1221,7 @@ func (m *managerTest) wipeJournal(t *testing.T) {
 	require.NoError(t, os.Remove(filepath.Join(m.m.c.Dir, "journal.pem")))
 
 	// Have a clean datastore.
-	m.ds = fakedatastore.New(t)
+	m.ds = fakedatastore.New(t, false)
 	m.cat.SetDataStore(m.ds)
 }
 

diff --git a/pkg/server/ca/manager/slot_test.go b/pkg/server/ca/manager/slot_test.go
@@ -155,7 +155,7 @@ func TestJournalLoad(t *testing.T) {
 	require.NoError(t, err)
 
 	km := fakeserverkeymanager.New(t)
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	td := spiffeid.RequireTrustDomainFromString("example.org")
 
 	cat := fakeservercatalog.New()

diff --git a/pkg/server/cache/dscache/cache_test.go b/pkg/server/cache/dscache/cache_test.go
@@ -22,7 +22,7 @@ func TestFetchBundleCache(t *testing.T) {
 	td := "spiffe://domain.test"
 	bundle1 := &common.Bundle{TrustDomainId: "spiffe://domain.test", RefreshHint: 1}
 	bundle2 := &common.Bundle{TrustDomainId: "spiffe://domain.test", RefreshHint: 2}
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	clock := clock.NewMock(t)
 	cache := New(ds, clock)
 	ctxWithCache := WithCache(context.Background())
@@ -150,7 +150,7 @@ func TestBundleInvalidations(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			// Create datastore and cache
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 			cache := New(ds, clock.NewMock(t))
 			ctxWithCache := WithCache(context.Background())
 

diff --git a/pkg/server/cache/entrycache/fullcache_ds_test.go b/pkg/server/cache/entrycache/fullcache_ds_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestEntryIteratorDS(t *testing.T) {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ctx := context.Background()
 
 	t.Run("no entries", func(t *testing.T) {
@@ -79,7 +79,7 @@ func TestEntryIteratorDS(t *testing.T) {
 }
 
 func TestAgentIteratorDS(t *testing.T) {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ctx := context.Background()
 
 	t.Run("no entries", func(t *testing.T) {

diff --git a/pkg/server/cache/entrycache/fullcache_test.go b/pkg/server/cache/entrycache/fullcache_test.go
@@ -45,7 +45,7 @@ var (
 )
 
 func TestCache(t *testing.T) {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ctx := context.Background()
 
 	rootID := spiffeid.RequireFromString("spiffe://example.org/root")
@@ -132,7 +132,7 @@ func TestCache(t *testing.T) {
 }
 
 func TestCacheReturnsClonedEntries(t *testing.T) {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 
 	expected, err := api.RegistrationEntryToProto(createRegistrationEntry(context.Background(), t, ds, &common.RegistrationEntry{
 		ParentId:  "spiffe://domain.test/node",
@@ -156,7 +156,7 @@ func TestCacheReturnsClonedEntries(t *testing.T) {
 }
 
 func TestFullCacheNodeAliasing(t *testing.T) {
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ctx := context.Background()
 
 	const serverID = "spiffe://example.org/spire/server"
@@ -270,7 +270,7 @@ func TestFullCacheExcludesNodeSelectorMappedEntriesForExpiredAgents(t *testing.T
 	// This is a mitigation for performance problems that arise when hydrating the cache today
 	// due to stale expired Agent data remaining in the datastore: https://github.com/spiffe/spire/issues/1836
 
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ctx := context.Background()
 	serverURI := &url.URL{
 		Scheme: spiffeScheme,

diff --git a/pkg/server/endpoints/authorized_entryfetcher_test.go b/pkg/server/endpoints/authorized_entryfetcher_test.go
@@ -15,7 +15,7 @@ func TestNewAuthorizedEntryFetcherWithEventsBasedCache(t *testing.T) {
 	ctx := context.Background()
 	log, _ := test.NewNullLogger()
 	clk := clock.NewMock(t)
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, true)
 
 	ef, err := NewAuthorizedEntryFetcherWithEventsBasedCache(ctx, log, clk, ds, defaultCacheReloadInterval, defaultPruneEventsOlderThan)
 	assert.NoError(t, err)
@@ -26,7 +26,7 @@ func TestNewAuthorizedEntryFetcherWithEventsBasedCacheErrorBuildingCache(t *test
 	ctx := context.Background()
 	log, _ := test.NewNullLogger()
 	clk := clock.NewMock(t)
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, true)
 
 	buildErr := errors.New("build error")
 	ds.SetNextError(buildErr)

diff --git a/pkg/server/endpoints/bundle/cache_test.go b/pkg/server/endpoints/bundle/cache_test.go
@@ -25,7 +25,7 @@ func TestFetchBundleX509(t *testing.T) {
 	updatedBundleX509Response := x509bundle.FromX509Authorities(td, certs2)
 	bundle1 := &common.Bundle{TrustDomainId: "spiffe://domain.test", RefreshHint: 1, SequenceNumber: 10, RootCas: []*common.Certificate{{DerBytes: certs1[0].Raw}}}
 	bundle2 := &common.Bundle{TrustDomainId: "spiffe://domain.test", RefreshHint: 2, SequenceNumber: 20, RootCas: []*common.Certificate{{DerBytes: certs2[0].Raw}}}
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	clock := clock.NewMock(t)
 	cache := NewCache(ds, clock)
 	ctx := context.Background()

diff --git a/pkg/server/endpoints/endpoints_test.go b/pkg/server/endpoints/endpoints_test.go
@@ -71,7 +71,7 @@ func TestNew(t *testing.T) {
 
 	log, _ := test.NewNullLogger()
 	metrics := fakemetrics.New()
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 
 	cat := fakeservercatalog.New()
 	cat.SetDataStore(ds)
@@ -124,7 +124,7 @@ func TestNewErrorCreatingAuthorizedEntryFetcher(t *testing.T) {
 
 	log, _ := test.NewNullLogger()
 	metrics := fakemetrics.New()
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	ds.SetNextError(errors.New("some datastore error"))
 
 	cat := fakeservercatalog.New()
@@ -175,7 +175,7 @@ func TestListenAndServe(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, listener.Close())
 
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	log, _ := test.NewNullLogger()
 	metrics := fakemetrics.New()
 

diff --git a/pkg/server/endpoints/middleware_test.go b/pkg/server/endpoints/middleware_test.go
@@ -36,7 +36,7 @@ type testEntries struct {
 func TestAuthorizedEntryFetcherWithFullCache(t *testing.T) {
 	ctx := context.Background()
 	log, _ := test.NewNullLogger()
-	ds := fakedatastore.New(t)
+	ds := fakedatastore.New(t, false)
 	clk := clock.NewMock(t)
 
 	e := createAuthorizedEntryTestData(t, ds)
@@ -230,7 +230,7 @@ func TestAgentAuthorizer(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			log, hook := test.NewNullLogger()
-			ds := fakedatastore.New(t)
+			ds := fakedatastore.New(t, false)
 
 			if tt.node != nil {
 				_, err := ds.CreateAttestedNode(context.Background(), tt.node)