From cac5a2688052afb6806e976c36d9111b62a8cd76 Mon Sep 17 00:00:00 2001 From: Hermawan Wijaya Date: Thu, 7 Dec 2023 15:53:34 +0700 Subject: [PATCH] chore: rename cleanup to cleanupFn --- internal/store/elasticsearch/discovery_repository.go | 4 ++-- internal/store/elasticsearch/discovery_repository_test.go | 4 ++-- internal/workermanager/discovery_worker.go | 6 +++--- internal/workermanager/in_situ_worker.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/store/elasticsearch/discovery_repository.go b/internal/store/elasticsearch/discovery_repository.go index 8c44a76f..84395b3d 100644 --- a/internal/store/elasticsearch/discovery_repository.go +++ b/internal/store/elasticsearch/discovery_repository.go @@ -99,7 +99,7 @@ func (repo *DiscoveryRepository) SyncAssets(ctx context.Context, indexName strin return nil, err } - cleanup := func() error { + cleanupFn := func() error { err = repo.updateAlias(ctx, indexName, defaultSearchIndex) if err != nil { return err @@ -117,7 +117,7 @@ func (repo *DiscoveryRepository) SyncAssets(ctx context.Context, indexName strin return nil } - return cleanup, err + return cleanupFn, err } func (repo *DiscoveryRepository) DeleteByID(ctx context.Context, assetID string) error { diff --git a/internal/store/elasticsearch/discovery_repository_test.go b/internal/store/elasticsearch/discovery_repository_test.go index 0253ae46..98ffda58 100644 --- a/internal/store/elasticsearch/discovery_repository_test.go +++ b/internal/store/elasticsearch/discovery_repository_test.go @@ -413,14 +413,14 @@ func TestDiscoveryRepository_SyncAssets(t *testing.T) { repo := store.NewDiscoveryRepository(esClient, log.NewNoop(), time.Second*10, []string{"number", "id"}) - cleanup, err := repo.SyncAssets(ctx, indexName) + cleanupFn, err := repo.SyncAssets(ctx, indexName) require.NoError(t, err) alias := cli.Indices.GetAlias resp, _ := alias(alias.WithIndex(indexName)) require.NotEmpty(t, resp) - err = cleanup() + err = cleanupFn() require.NoError(t, err) res, err := cli.Indices.Exists([]string{"bigquery-test"}) diff --git a/internal/workermanager/discovery_worker.go b/internal/workermanager/discovery_worker.go index 62f91791..9019a972 100644 --- a/internal/workermanager/discovery_worker.go +++ b/internal/workermanager/discovery_worker.go @@ -15,7 +15,7 @@ import ( type DiscoveryRepository interface { Upsert(context.Context, asset.Asset) error DeleteByURN(ctx context.Context, assetURN string) error - SyncAssets(ctx context.Context, indexName string) (cleanup func() error, err error) + SyncAssets(ctx context.Context, indexName string) (cleanupFn func() error, err error) } func (m *Manager) EnqueueIndexAssetJob(ctx context.Context, ast asset.Asset) error { @@ -88,7 +88,7 @@ func (m *Manager) SyncAssets(ctx context.Context, job worker.JobSpec) error { } } - cleanup, err := m.discoveryRepo.SyncAssets(ctx, service) + cleanupFn, err := m.discoveryRepo.SyncAssets(ctx, service) if err != nil { return err } @@ -118,7 +118,7 @@ func (m *Manager) SyncAssets(ctx context.Context, job worker.JobSpec) error { it++ } - return cleanup() + return cleanupFn() } func (m *Manager) EnqueueDeleteAssetJob(ctx context.Context, urn string) error { diff --git a/internal/workermanager/in_situ_worker.go b/internal/workermanager/in_situ_worker.go index a2b51f94..f0067d79 100644 --- a/internal/workermanager/in_situ_worker.go +++ b/internal/workermanager/in_situ_worker.go @@ -42,7 +42,7 @@ func (m *InSituWorker) EnqueueSyncAssetJob(ctx context.Context, service string) m.mutex.Lock() defer m.mutex.Unlock() - cleanup, err := m.discoveryRepo.SyncAssets(ctx, service) + cleanupFn, err := m.discoveryRepo.SyncAssets(ctx, service) if err != nil { return err } @@ -71,7 +71,7 @@ func (m *InSituWorker) EnqueueSyncAssetJob(ctx context.Context, service string) it++ } - return cleanup() + return cleanupFn() } func (*InSituWorker) Close() error { return nil }