fixup! Add new API methods

cmd/gitlab-zoekt-indexer/main.go

@@ -28,7 +28,6 @@ type options struct {
 }
 
 type indexServer struct {
-	indexDir             string
 	indexBuilder         indexBuilder
 	promRegistry         *prometheus.Registry
 	metricsRequestsTotal *prometheus.CounterVec
@@ -49,10 +48,17 @@ type indexRequest struct {
 }
 
 type indexBuilder interface {
+	getIndexDir() string
 	indexRepository(ctx context.Context, req indexRequest, indexDir string) error
 }
 
-type defaultIndexBuilder struct{}
+type defaultIndexBuilder struct {
+	indexDir string
+}
+
+func (b defaultIndexBuilder) getIndexDir() string {
+	return b.indexDir
+}
 
 func (b defaultIndexBuilder) indexRepository(ctx context.Context, req indexRequest, indexDir string) error {
 	if req.GitalyConnectionInfo == nil {
@@ -89,8 +95,8 @@ func (b defaultIndexBuilder) indexRepository(ctx context.Context, req indexReque
 }
 
 func (s *indexServer) createIndexDir() {
-	if err := os.MkdirAll(s.indexDir, 0o755); err != nil {
-		log.Fatalf("createIndexDir %s: %v", s.indexDir, err)
+	if err := os.MkdirAll(s.indexBuilder.getIndexDir(), 0o755); err != nil {
+		log.Fatalf("createIndexDir %s: %v", s.indexBuilder.getIndexDir(), err)
 	}
 }
 
@@ -112,7 +118,7 @@ func (s *indexServer) handleStatus() http.HandlerFunc {
 		}
 
 		idx := &indexer.Indexer{
-			IndexDir:  s.indexDir,
+			IndexDir:  s.indexBuilder.getIndexDir(),
 			ProjectID: uint32(repoID),
 		}
 
@@ -174,7 +180,7 @@ func (s *indexServer) handleIndex() http.HandlerFunc {
 			return
 		}
 
-		err = s.indexBuilder.indexRepository(r.Context(), req, s.indexDir)
+		err = s.indexBuilder.indexRepository(r.Context(), req, s.indexBuilder.getIndexDir())
 		if err != nil {
 			s.respondWithError(w, r, route, err)
 			return
@@ -214,10 +220,10 @@ func (s *indexServer) handleTruncate() http.HandlerFunc {
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
-		err := emptyDirectory(s.indexDir)
+		err := emptyDirectory(s.indexBuilder.getIndexDir())
 
 		if err != nil {
-			err = fmt.Errorf("failed to empty indexDir: %v with error: %v", s.indexDir, err)
+			err = fmt.Errorf("failed to empty indexDir: %v with error: %v", s.indexBuilder.getIndexDir(), err)
 
 			s.respondWithError(w, r, route, err)
 			return
@@ -304,8 +310,9 @@ func main() {
 	opts := parseOptions()
 
 	server := indexServer{
-		indexDir:     opts.indexDir,
-		indexBuilder: defaultIndexBuilder{},
+		indexBuilder: defaultIndexBuilder{
+			indexDir: opts.indexDir,
+		},
 	}
 
 	server.startIndexingApi(opts.listen)

cmd/gitlab-zoekt-indexer/main_test.go

@@ -14,18 +14,26 @@ import (
 	"gitlab.com/gitlab-org/search-team/gitlab-zoekt-indexer/internal/projectpath"
 )
 
-type indexBuilderMock struct{}
+type indexBuilderMock struct {
+	indexDir string
+}
 
 func (b indexBuilderMock) indexRepository(ctx context.Context, req indexRequest, indexDir string) error {
 	return nil
 }
 
+func (b indexBuilderMock) getIndexDir() string {
+	return b.indexDir
+}
+
 func TestCreateIndexDir(t *testing.T) {
 	dir := filepath.Join(projectpath.Root, "tmp/test_create_index_dir")
 	defer os.RemoveAll(dir)
 
 	s := indexServer{
-		indexDir: dir,
+		indexBuilder: indexBuilderMock{
+			indexDir: dir,
+		},
 	}
 
 	s.createIndexDir()
@@ -73,7 +81,9 @@ func TestHandleStatus(t *testing.T) {
 
 	dir := filepath.Join(projectpath.Root, "_support/test/shards")
 	server := indexServer{
-		indexDir: dir,
+		indexBuilder: indexBuilderMock{
+			indexDir: dir,
+		},
 	}
 
 	server.initMetrics()
@@ -113,7 +123,9 @@ func TestHandleStatusWhenErr(t *testing.T) {
 
 	dir := filepath.Join(projectpath.Root, "_support/test/shards")
 	server := indexServer{
-		indexDir: dir,
+		indexBuilder: indexBuilderMock{
+			indexDir: dir,
+		},
 	}
 
 	server.initMetrics()
@@ -130,7 +142,9 @@ func TestHandleTruncate(t *testing.T) {
 
 	dir := filepath.Join(projectpath.Root, "tmp/truncate_test")
 	server := indexServer{
-		indexDir: dir,
+		indexBuilder: indexBuilderMock{
+			indexDir: dir,
+		},
 	}
 
 	server.createIndexDir()
@@ -161,8 +175,9 @@ func TestHandleIndexWhenErr(t *testing.T) {
 
 	dir := filepath.Join(projectpath.Root, "tmp/index_test")
 	server := indexServer{
-		indexDir:     dir,
-		indexBuilder: indexBuilderMock{},
+		indexBuilder: indexBuilderMock{
+			indexDir: dir,
+		},
 	}
 	server.createIndexDir()
 	defer os.RemoveAll(dir)
@@ -182,8 +197,9 @@ func TestHandleIndexWhenTimeoutErr(t *testing.T) {
 
 	dir := filepath.Join(projectpath.Root, "tmp/index_test")
 	server := indexServer{
-		indexDir:     dir,
-		indexBuilder: defaultIndexBuilder{},
+		indexBuilder: defaultIndexBuilder{
+			indexDir: dir,
+		},
 	}
 	server.createIndexDir()
 	defer os.RemoveAll(dir)