Skip to content

Commit 497ac90

Browse files
committed
Fix import paths for Go modules
1 parent d05affb commit 497ac90

File tree

92 files changed

+91
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+91
-397
lines changed

bulk.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"fmt"
1212
"net/url"
1313

14-
"github.com/olivere/elastic/uritemplates"
14+
"github.com/olivere/elastic/v7/uritemplates"
1515
)
1616

1717
// BulkService allows for batching bulk requests and sending them to

cat_aliases.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// CatAliasesService shows information about currently configured aliases

cat_allocation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// CatAllocationService provides a snapshot of how many shards are allocated

cat_count.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// CatCountService provides quick access to the document count of the entire cluster,

cat_indices.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// CatIndicesService returns the list of indices plus some additional

client.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121

2222
"github.com/pkg/errors"
2323

24-
"github.com/olivere/elastic/config"
24+
"github.com/olivere/elastic/v7/config"
2525
)
2626

2727
const (
2828
// Version is the current version of Elastic.
29-
Version = "6.2.16"
29+
Version = "7.0.0"
3030

3131
// DefaultURL is the default endpoint of Elasticsearch on the local machine.
3232
// 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 {
15601560
return NewIndicesRolloverService(c).Alias(alias)
15611561
}
15621562

1563-
// TypeExists allows to check if one or more types exist in one or more indices.
1564-
func (c *Client) TypeExists() *IndicesExistsTypeService {
1565-
return NewIndicesExistsTypeService(c)
1566-
}
1567-
15681563
// IndexStats provides statistics on different operations happining
15691564
// in one or more indices.
15701565
func (c *Client) IndexStats(indices ...string) *IndicesStatsService {

client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/fortytw2/leaktest"
2525

26-
"github.com/olivere/elastic/config"
26+
"github.com/olivere/elastic/v7/config"
2727
)
2828

2929
func findConn(s string, slice ...*conn) (int, bool) {

cluster_health.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// ClusterHealthService allows to get a very simple status on the health of the cluster.

cluster_state.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// ClusterStateService allows to get a comprehensive state information of the whole cluster.

cluster_stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// ClusterStatsService is documented at

count.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// CountService is a convenient service for determining the

delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"net/url"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// DeleteService allows to delete a typed JSON document from a specified

delete_by_query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/url"
1212
"strings"
1313

14-
"github.com/olivere/elastic/uritemplates"
14+
"github.com/olivere/elastic/v7/uritemplates"
1515
)
1616

1717
// DeleteByQueryService deletes documents that match a query.

exists.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"net/url"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// ExistsService checks for the existence of a document using HEAD.

explain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// ExplainService computes a score explanation for a query and

field_caps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/url"
1212
"strings"
1313

14-
"github.com/olivere/elastic/uritemplates"
14+
"github.com/olivere/elastic/v7/uritemplates"
1515
)
1616

1717
// FieldCapsService allows retrieving the capabilities of fields among multiple indices.

get.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/url"
1212
"strings"
1313

14-
"github.com/olivere/elastic/uritemplates"
14+
"github.com/olivere/elastic/v7/uritemplates"
1515
)
1616

1717
// GetService allows to get a typed JSON document from the index based

go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ require (
88
github.com/golang/mock v1.2.0 // indirect
99
github.com/google/go-cmp v0.2.0
1010
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe
11-
github.com/olivere/elastic v6.2.16+incompatible
1211
github.com/opentracing/opentracing-go v1.1.0
1312
github.com/pkg/errors v0.8.1
1413
github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9
1514
go.opencensus.io v0.19.2
16-
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
1715
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
1816
gopkg.in/yaml.v2 v2.2.2 // indirect
1917
)

index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"net/url"
1111

12-
"github.com/olivere/elastic/uritemplates"
12+
"github.com/olivere/elastic/v7/uritemplates"
1313
)
1414

1515
// IndexService adds or updates a typed JSON document in a specified index,

indices_analyze.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"net/url"
1111

12-
"github.com/olivere/elastic/uritemplates"
12+
"github.com/olivere/elastic/v7/uritemplates"
1313
)
1414

1515
// IndicesAnalyzeService performs the analysis process on a text and returns

indices_close.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"net/url"
1111

12-
"github.com/olivere/elastic/uritemplates"
12+
"github.com/olivere/elastic/v7/uritemplates"
1313
)
1414

1515
// IndicesCloseService closes an index.

indices_create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"errors"
1010
"net/url"
1111

12-
"github.com/olivere/elastic/uritemplates"
12+
"github.com/olivere/elastic/v7/uritemplates"
1313
)
1414

1515
// IndicesCreateService creates a new index.

indices_delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/url"
1111
"strings"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// IndicesDeleteService allows to delete existing indices.

indices_delete_template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"net/url"
1111

12-
"github.com/olivere/elastic/uritemplates"
12+
"github.com/olivere/elastic/v7/uritemplates"
1313
)
1414

1515
// IndicesDeleteTemplateService deletes index templates.

indices_exists.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/url"
1212
"strings"
1313

14-
"github.com/olivere/elastic/uritemplates"
14+
"github.com/olivere/elastic/v7/uritemplates"
1515
)
1616

1717
// IndicesExistsService checks if an index or indices exist or not.

indices_exists_template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"net/url"
1212

13-
"github.com/olivere/elastic/uritemplates"
13+
"github.com/olivere/elastic/v7/uritemplates"
1414
)
1515

1616
// IndicesExistsTemplateService checks if a given template exists.

0 commit comments

Comments
 (0)