Move CreateIndex() and DeleteIndex() out of the Indexer

elastic/client.go

@@ -84,29 +84,3 @@ func NewClient(config *Config) (*Client, error) {
 func (c *Client) Flush() error {
 	return c.bulk.Flush()
 }
-
-func (c *Client) CreateIndex(indexName, mapping string) error {
-	createIndex, err := c.client.CreateIndex(indexName).BodyString(mapping).Do(context.Background())
-	if err != nil {
-		return err
-	}
-
-	if !createIndex.Acknowledged {
-		return timeoutError
-	}
-
-	return nil
-}
-
-func (c *Client) DeleteIndex(indexName string) error {
-	deleteIndex, err := c.client.DeleteIndex(indexName).Do(context.Background())
-	if err != nil {
-		return err
-	}
-
-	if !deleteIndex.Acknowledged {
-		return timeoutError
-	}
-
-	return nil
-}

indexer/create.go → elastic/index.go

-package indexer
+package elastic
+
+import (
+	"context"
+)
 var indexMapping = `
 {
@@ -515,7 +519,29 @@ var indexMapping = `
 }
 `
-// Creates an index matching that created by gitlab-elasticsearch-git v1.1.1
-func (i *Indexer) CreateIndex() error {
-	return i.Submitter.CreateIndex(i.IndexName, indexMapping)
+// CreateIndex creates an index matching that created by gitlab-elasticsearch-git v1.1.1
+func (c *Client) CreateIndex(indexName string) error {
+	createIndex, err := c.client.CreateIndex(indexName).BodyString(indexMapping).Do(context.Background())
+	if err != nil {
+		return err
+	}
+
+	if !createIndex.Acknowledged {
+		return timeoutError
+	}
+
+	return nil
+}
+
+func (c *Client) DeleteIndex(indexName string) error {
+	deleteIndex, err := c.client.DeleteIndex(indexName).Do(context.Background())
+	if err != nil {
+		return err
+	}
+
+	if !deleteIndex.Acknowledged {
+		return timeoutError
+	}
+
+	return nil
 }

indexer/indexer.go

@@ -10,7 +10,6 @@ import (
 )
 type Submitter interface {
-	CreateIndex(indexName, mapping string) error
 	Flush() error
 }

integration_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gitlab.com/gitlab-org/es-git-go/elastic"
-	"gitlab.com/gitlab-org/es-git-go/indexer"
 )
 var (
@@ -41,8 +40,7 @@ func buildIndex(t *testing.T) (string, func()) {
 	client, err := elastic.FromEnv()
 	assert.NoError(t, err)
-	indexer := indexer.Indexer{IndexName: indexName, Submitter: client}
-	assert.NoError(t, indexer.CreateIndex())
+	assert.NoError(t, client.CreateIndex(indexName))
 	return railsEnv, func() {
 		client.DeleteIndex(indexName)