consume new client in esutil package (#76)

rode · May 3, 2021 · 5c2d664 · 5c2d664
1 parent 289be2a
commit 5c2d664
Show file tree

Hide file tree

Showing 9 changed files with 1,899 additions and 2,142 deletions.
diff --git a/Makefile b/Makefile
@@ -15,6 +15,7 @@ vet:
 mocks:
 	mockgen -package mocks -destination go/mocks/filtering.go github.com/rode/grafeas-elasticsearch/go/v1beta1/storage/filtering Filterer
 	mockgen -package mocks -destination go/mocks/index.go github.com/rode/grafeas-elasticsearch/go/v1beta1/storage/esutil IndexManager
+	counterfeiter go/v1beta1/storage/esutil Client
 	mockgen -package mocks -destination go/mocks/orchestrator.go github.com/rode/grafeas-elasticsearch/go/v1beta1/storage/migration Orchestrator
 
 test: fmtcheck vet

diff --git a/go/mocks/index.go b/go/mocks/index.go
diff --git a/go/v1beta1/main/main.go b/go/v1beta1/main/main.go
@@ -50,7 +50,7 @@ func main() {
 		migrator := migration.NewEsMigrator(logger.Named("EsMigrator"), esClient, indexManager)
 		migrationOrchestrator := migration.NewEsMigrationOrchestrator(logger.Named("EsMigrationOrchestrator"), migrator)
 
-		return storage.NewElasticsearchStorage(logger.Named("ElasticsearchStore"), esClient, filtering.NewFilterer(), c, indexManager, migrationOrchestrator), nil
+		return storage.NewElasticsearchStorage(logger.Named("ElasticsearchStore"), esutil.NewClient(logger, esClient), filtering.NewFilterer(), c, indexManager, migrationOrchestrator), nil
 	}, logger)
 
 	err = grafeasStorage.RegisterStorageTypeProvider("elasticsearch", registerStorageTypeProvider)