diff --git a/pkg/storage/unified/resource/metadatastore.go b/pkg/storage/unified/resource/internalstore.go similarity index 86% rename from pkg/storage/unified/resource/metadatastore.go rename to pkg/storage/unified/resource/internalstore.go index 785fd0b75b0..31bd27f2294 100644 --- a/pkg/storage/unified/resource/metadatastore.go +++ b/pkg/storage/unified/resource/internalstore.go @@ -14,7 +14,7 @@ const ( metadataSection = "unified/metadata" ) -type metadataStore struct { +type internalStore struct { kv KV } @@ -48,13 +48,13 @@ type Metadata struct { LastImportTime time.Time `json:"lastImportTime"` } -func newMetadataStore(kv KV) *metadataStore { - return &metadataStore{ +func newInternalStore(kv KV) *internalStore { + return &internalStore{ kv: kv, } } -func (d *metadataStore) Get(ctx context.Context, key MetadataKey) (Metadata, error) { +func (d *internalStore) Get(ctx context.Context, key MetadataKey) (Metadata, error) { if err := key.Validate(); err != nil { return Metadata{}, fmt.Errorf("invalid metadata key: %w", err) } @@ -62,7 +62,7 @@ func (d *metadataStore) Get(ctx context.Context, key MetadataKey) (Metadata, err return d.get(ctx, key.String()) } -func (d *metadataStore) get(ctx context.Context, key string) (Metadata, error) { +func (d *internalStore) get(ctx context.Context, key string) (Metadata, error) { reader, err := d.kv.Get(ctx, metadataSection, key) if err != nil { return Metadata{}, err @@ -75,7 +75,7 @@ func (d *metadataStore) get(ctx context.Context, key string) (Metadata, error) { return metadata, nil } -func (d *metadataStore) GetAll(ctx context.Context) iter.Seq2[Metadata, error] { +func (d *internalStore) GetAll(ctx context.Context) iter.Seq2[Metadata, error] { opts := ListOptions{ Sort: SortOrderAsc, StartKey: "", @@ -95,7 +95,7 @@ func (d *metadataStore) GetAll(ctx context.Context) iter.Seq2[Metadata, error] { } } -func (d *metadataStore) Save(ctx context.Context, metadata Metadata) error { +func (d *internalStore) Save(ctx context.Context, metadata Metadata) error { metadataKey := MetadataKey{ Namespace: metadata.Namespace, Group: metadata.Group, diff --git a/pkg/storage/unified/resource/metadatastore_test.go b/pkg/storage/unified/resource/internalstore_test.go similarity index 90% rename from pkg/storage/unified/resource/metadatastore_test.go rename to pkg/storage/unified/resource/internalstore_test.go index 347c1b34102..400c1d86bb7 100644 --- a/pkg/storage/unified/resource/metadatastore_test.go +++ b/pkg/storage/unified/resource/internalstore_test.go @@ -10,22 +10,22 @@ import ( "github.com/stretchr/testify/require" ) -func setupTestMetadataStore(t *testing.T) *metadataStore { +func setupTestInternalStore(t *testing.T) *internalStore { db := setupTestBadgerDB(t) t.Cleanup(func() { err := db.Close() require.NoError(t, err) }) kv := NewBadgerKV(db) - return newMetadataStore(kv) + return newInternalStore(kv) } -func TestNewMetadataStore(t *testing.T) { - store := setupTestMetadataStore(t) +func TestNewInternalStore(t *testing.T) { + store := setupTestInternalStore(t) assert.NotNil(t, store.kv) } -func TestMetadataStore_MetadataKey_String(t *testing.T) { +func TestInternalStore_MetadataKey_String(t *testing.T) { tests := []struct { name string metadataKey MetadataKey @@ -59,7 +59,7 @@ func TestMetadataStore_MetadataKey_String(t *testing.T) { } } -func TestMetadataStore_MetadataKey_Validate(t *testing.T) { +func TestInternalStore_MetadataKey_Validate(t *testing.T) { tests := []struct { name string key MetadataKey @@ -116,10 +116,10 @@ func TestMetadataStore_MetadataKey_Validate(t *testing.T) { } } -func TestMetadataStore(t *testing.T) { +func TestInternalStore(t *testing.T) { t.Run("Save and Get", func(t *testing.T) { ctx := context.Background() - store := setupTestMetadataStore(t) + store := setupTestInternalStore(t) metadata := Metadata{ Namespace: "default", Group: "apps", @@ -143,7 +143,7 @@ func TestMetadataStore(t *testing.T) { t.Run("GetAll", func(t *testing.T) { ctx := context.Background() - store := setupTestMetadataStore(t) + store := setupTestInternalStore(t) metadatas := []Metadata{ { Namespace: "stacks-1", diff --git a/pkg/storage/unified/resource/storage_backend.go b/pkg/storage/unified/resource/storage_backend.go index 0f9a4daab3d..9c64a773c94 100644 --- a/pkg/storage/unified/resource/storage_backend.go +++ b/pkg/storage/unified/resource/storage_backend.go @@ -58,7 +58,7 @@ type kvStorageBackend struct { bulkLock *BulkLock dataStore *dataStore eventStore *eventStore - metadataStore *metadataStore + internalStore *internalStore notifier *notifier builder DocumentBuilder log logging.Logger @@ -108,7 +108,7 @@ func NewKVStorageBackend(opts KVBackendOptions) (StorageBackend, error) { bulkLock: NewBulkLock(), dataStore: newDataStore(kv), eventStore: eventStore, - metadataStore: newMetadataStore(kv), + internalStore: newInternalStore(kv), notifier: newNotifier(eventStore, notifierOptions{}), snowflake: s, builder: StandardDocumentBuilder(), // For now we use the standard document builder. @@ -1237,7 +1237,7 @@ func (k *kvStorageBackend) GetResourceStats(ctx context.Context, nsr NamespacedR func (k *kvStorageBackend) GetResourceLastImportTimes(ctx context.Context) iter.Seq2[ResourceLastImportTime, error] { return func(yield func(ResourceLastImportTime, error) bool) { - for metadata, err := range k.metadataStore.GetAll(ctx) { + for metadata, err := range k.internalStore.GetAll(ctx) { if err != nil { yield(ResourceLastImportTime{}, err) return @@ -1264,7 +1264,7 @@ func (k *kvStorageBackend) GetResourceLastImportTimes(ctx context.Context) iter. } func (k *kvStorageBackend) updateLastImportTime(ctx context.Context, key *resourcepb.ResourceKey, now time.Time) error { - metadata, err := k.metadataStore.Get(ctx, MetadataKey{ + metadata, err := k.internalStore.Get(ctx, MetadataKey{ Namespace: key.Namespace, Group: key.Group, Resource: key.Resource, @@ -1284,7 +1284,7 @@ func (k *kvStorageBackend) updateLastImportTime(ctx context.Context, key *resour } metadata.LastImportTime = now.UTC() - return k.metadataStore.Save(ctx, metadata) + return k.internalStore.Save(ctx, metadata) } func (k *kvStorageBackend) ProcessBulk(ctx context.Context, setting BulkSettings, iter BulkRequestIterator) *resourcepb.BulkResponse {