Fix import paths for Go modules

raswinraaj · Mar 30, 2019 · 497ac90 · 497ac90
1 parent d05affb
commit 497ac90
Show file tree

Hide file tree

Showing 92 changed files with 91 additions and 397 deletions.
diff --git a/bulk.go b/bulk.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // BulkService allows for batching bulk requests and sending them to

diff --git a/cat_aliases.go b/cat_aliases.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // CatAliasesService shows information about currently configured aliases

diff --git a/cat_allocation.go b/cat_allocation.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // CatAllocationService provides a snapshot of how many shards are allocated

diff --git a/cat_count.go b/cat_count.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // CatCountService provides quick access to the document count of the entire cluster,

diff --git a/cat_indices.go b/cat_indices.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // CatIndicesService returns the list of indices plus some additional

diff --git a/client.go b/client.go
@@ -21,12 +21,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/olivere/elastic/config"
+	"github.com/olivere/elastic/v7/config"
 )
 
 const (
 	// Version is the current version of Elastic.
-	Version = "6.2.16"
+	Version = "7.0.0"
 
 	// DefaultURL is the default endpoint of Elasticsearch on the local machine.
 	// It is used e.g. when initializing a new Client without a specific URL.
@@ -1560,11 +1560,6 @@ func (c *Client) RolloverIndex(alias string) *IndicesRolloverService {
 	return NewIndicesRolloverService(c).Alias(alias)
 }
 
-// TypeExists allows to check if one or more types exist in one or more indices.
-func (c *Client) TypeExists() *IndicesExistsTypeService {
-	return NewIndicesExistsTypeService(c)
-}
-
 // IndexStats provides statistics on different operations happining
 // in one or more indices.
 func (c *Client) IndexStats(indices ...string) *IndicesStatsService {

diff --git a/client_test.go b/client_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/fortytw2/leaktest"
 
-	"github.com/olivere/elastic/config"
+	"github.com/olivere/elastic/v7/config"
 )
 
 func findConn(s string, slice ...*conn) (int, bool) {

diff --git a/cluster_health.go b/cluster_health.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // ClusterHealthService allows to get a very simple status on the health of the cluster.

diff --git a/cluster_state.go b/cluster_state.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // ClusterStateService allows to get a comprehensive state information of the whole cluster.

diff --git a/cluster_stats.go b/cluster_stats.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // ClusterStatsService is documented at

diff --git a/count.go b/count.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // CountService is a convenient service for determining the

diff --git a/delete.go b/delete.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // DeleteService allows to delete a typed JSON document from a specified

diff --git a/delete_by_query.go b/delete_by_query.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // DeleteByQueryService deletes documents that match a query.

diff --git a/exists.go b/exists.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // ExistsService checks for the existence of a document using HEAD.

diff --git a/explain.go b/explain.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // ExplainService computes a score explanation for a query and

diff --git a/field_caps.go b/field_caps.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // FieldCapsService allows retrieving the capabilities of fields among multiple indices.

diff --git a/get.go b/get.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // GetService allows to get a typed JSON document from the index based

diff --git a/go.mod b/go.mod
@@ -8,12 +8,10 @@ require (
 	github.com/golang/mock v1.2.0 // indirect
 	github.com/google/go-cmp v0.2.0
 	github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe
-	github.com/olivere/elastic v6.2.16+incompatible
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/pkg/errors v0.8.1
 	github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9
 	go.opencensus.io v0.19.2
-	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
diff --git a/index.go b/index.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndexService adds or updates a typed JSON document in a specified index,

diff --git a/indices_analyze.go b/indices_analyze.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesAnalyzeService performs the analysis process on a text and returns

diff --git a/indices_close.go b/indices_close.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesCloseService closes an index.

diff --git a/indices_create.go b/indices_create.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesCreateService creates a new index.

diff --git a/indices_delete.go b/indices_delete.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesDeleteService allows to delete existing indices.

diff --git a/indices_delete_template.go b/indices_delete_template.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesDeleteTemplateService deletes index templates.

diff --git a/indices_exists.go b/indices_exists.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesExistsService checks if an index or indices exist or not.

diff --git a/indices_exists_template.go b/indices_exists_template.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/olivere/elastic/uritemplates"
+	"github.com/olivere/elastic/v7/uritemplates"
 )
 
 // IndicesExistsTemplateService checks if a given template exists.