Move to Go modules and some finishing touches

This commit introduces Go modules, so you actually need to use

```
github.com/olivere/elastic/v7
```

as an import path.

Notice we didn't tag the `v7.0.0` release as of now, so it's still
preparation.

README.md

@@ -1,6 +1,6 @@
 # Elastic
 
-**This is a development branch that is actively being worked on. DO NOT USE IN PRODUCTION! If you want to use stable versions of Elastic, please use a dependency manager like [dep](https://github.com/golang/dep).**
+**This is a development branch that is actively being worked on. DO NOT USE IN PRODUCTION! If you want to use stable versions of Elastic, please use Go modules for the 7.x release (or later) or a dependency manager like [dep](https://github.com/golang/dep) for earlier releases.**
 
 Elastic is an [Elasticsearch](http://www.elasticsearch.org/) client for the
 [Go](http://www.golang.org/) programming language.
@@ -14,17 +14,17 @@ See the [wiki](https://github.com/olivere/elastic/wiki) for additional informati
 
 <a href="https://www.buymeacoffee.com/Bjd96U8fm" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
 
-
 ## Releases
 
-**The release branches (e.g. [`release-branch.v6`](https://github.com/olivere/elastic/tree/release-branch.v6))
+**The release branches (e.g. [`release-branch.v7`](https://github.com/olivere/elastic/tree/release-branch.v7))
 are actively being worked on and can break at any time.
-If you want to use stable versions of Elastic, please use a dependency manager like [dep](https://github.com/golang/dep).**
+If you want to use stable versions of Elastic, please use Go modules.**
 
 Here's the version matrix:
 
 Elasticsearch version | Elastic version  | Package URL | Remarks |
 ----------------------|------------------|-------------|---------|
+7.x                   | 7.0              | [`github.com/olivere/elastic/v7`](https://github.com/olivere/elastic) ([source](https://github.com/olivere/elastic/tree/release-branch.v7) [doc](http://godoc.org/github.com/olivere/elastic)) | Use Go modules.
 6.x                   | 6.0              | [`github.com/olivere/elastic`](https://github.com/olivere/elastic) ([source](https://github.com/olivere/elastic/tree/release-branch.v6) [doc](http://godoc.org/github.com/olivere/elastic)) | Use a dependency manager (see below).
 5.x                   | 5.0              | [`gopkg.in/olivere/elastic.v5`](https://gopkg.in/olivere/elastic.v5) ([source](https://github.com/olivere/elastic/tree/release-branch.v5) [doc](http://godoc.org/gopkg.in/olivere/elastic.v5)) | Actively maintained.
 2.x                   | 3.0              | [`gopkg.in/olivere/elastic.v3`](https://gopkg.in/olivere/elastic.v3) ([source](https://github.com/olivere/elastic/tree/release-branch.v3) [doc](http://godoc.org/gopkg.in/olivere/elastic.v3)) | Deprecated. Please update.
@@ -33,22 +33,27 @@ Elasticsearch version | Elastic version  | Package URL | Remarks |
 
 **Example:**
 
-You have installed Elasticsearch 6.0.0 and want to use Elastic.
-As listed above, you should use Elastic 6.0.
+You have installed Elasticsearch 7.0.0 and want to use Elastic.
+As listed above, you should use Elastic 7.0 (code is in `release-branch.v7`).
 
-To use the required version of Elastic in your application, it is strongly
-advised to use a tool like
-[dep](https://github.com/golang/dep)
-or
-[Go modules](https://github.com/golang/go/wiki/Modules)
-to manage dependencies. Make sure to use a version such as `^6.0.0`.
+To use the required version of Elastic in your application, you
+shoud use [Go modules](https://github.com/golang/go/wiki/Modules)
+to manage dependencies. Make sure to use a version such as `7.0.0` or later.
 
 To use Elastic, import:
 
 ```go
-import "github.com/olivere/elastic"
+import "github.com/olivere/elastic/v7"
 ```
 
+### Elastic 7.0
+
+Elastic 7.0 targets Elasticsearch 7.x which [is currently at rc1](https://www.elastic.co/guide/en/elasticsearch/reference/7.0/release-notes-7.0.0-rc1.html).
+
+As always with major version, there are a lot of [breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/7.0/release-notes-7.0.0-rc1.html#breaking-7.0.0-rc1).
+We will use this as an opportunity to [clean up and refactor Elastic](https://github.com/olivere/elastic/blob/release-branch.v7/CHANGELOG-7.0.md),
+as we already did in earlier (major) releases.
+
 ### Elastic 6.0
 
 Elastic 6.0 targets Elasticsearch 6.x which was [released on 14th November 2017](https://www.elastic.co/blog/elasticsearch-6-0-0-released).
@@ -101,7 +106,7 @@ Having said that, there have been no big API changes that required you
 to rewrite your application big time. More often than not it's renaming APIs
 and adding/removing features so that Elastic is in sync with Elasticsearch.
 
-Elastic has been used in production starting with Elasticsearch 0.90 up to recent 6.x
+Elastic has been used in production starting with Elasticsearch 0.90 up to recent 7.x
 versions. Furthermore, we use [Travis CI](https://travis-ci.org/)
 to test Elastic with the most recent versions of Elasticsearch and Go.
 See the [.travis.yml](https://github.com/olivere/elastic/blob/master/.travis.yml)

aws/sign_v4_test.go

@@ -11,9 +11,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/smartystreets/go-aws-auth"
+	awsauth "github.com/smartystreets/go-aws-auth"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func TestSigningClient(t *testing.T) {

aws/v4/aws_v4_test.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/credentials"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func TestSigningClient(t *testing.T) {

cluster-test/cluster-test.go

@@ -18,7 +18,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 type Tweet struct {

example_test.go

@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 type Tweet struct {

go.mod

@@ -0,0 +1,19 @@
+module github.com/olivere/elastic/v7
+
+go 1.12
+
+require (
+	github.com/aws/aws-sdk-go v1.19.6
+	github.com/fortytw2/leaktest v1.3.0
+	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
+)

recipes/aws-connect-v4/main.go

@@ -18,8 +18,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/olivere/env"
 
-	"github.com/olivere/elastic"
-	aws "github.com/olivere/elastic/aws/v4"
+	"github.com/olivere/elastic/v7"
+	aws "github.com/olivere/elastic/v7/aws/v4"
 )
 
 func main() {

recipes/aws-connect/.gitignore

@@ -0,0 +1 @@
+/aws-connect

recipes/aws-connect/main.go

@@ -16,10 +16,10 @@ import (
 	"log"
 
 	"github.com/olivere/env"
-	"github.com/smartystreets/go-aws-auth"
+	awsauth "github.com/smartystreets/go-aws-auth"
 
-	"github.com/olivere/elastic"
-	"github.com/olivere/elastic/aws"
+	"github.com/olivere/elastic/v7"
+	"github.com/olivere/elastic/v7/aws"
 )
 
 func main() {

recipes/aws-mapping-v4/main.go

@@ -23,8 +23,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/olivere/env"
 
-	"github.com/olivere/elastic"
-	aws "github.com/olivere/elastic/aws/v4"
+	"github.com/olivere/elastic/v7"
+	aws "github.com/olivere/elastic/v7/aws/v4"
 )
 
 const (

recipes/bulk_insert/.gitignore

@@ -0,0 +1 @@
+/bulk_insert

recipes/bulk_insert/bulk_insert.go

@@ -36,7 +36,7 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func main() {

recipes/bulk_processor/.gitignore

@@ -0,0 +1 @@
+/bulk_processor

recipes/bulk_processor/main.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/olivere/elastic"
-	"github.com/olivere/elastic/config"
+	"github.com/olivere/elastic/v7"
+	"github.com/olivere/elastic/v7/config"
 )
 
 func main() {

recipes/connect/.gitignore

@@ -0,0 +1 @@
+/connect

recipes/connect/connect.go

@@ -16,7 +16,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func main() {

recipes/connect_with_config/.gitignore

@@ -0,0 +1 @@
+/connect_with_config

recipes/connect_with_config/connect_with_config.go

@@ -17,8 +17,8 @@ import (
 	"log"
 	"runtime"
 
-	"github.com/olivere/elastic"
-	"github.com/olivere/elastic/config"
+	"github.com/olivere/elastic/v7"
+	"github.com/olivere/elastic/v7/config"
 )
 
 func main() {

recipes/go-modules/main.go

@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/olivere/elastic" // <- should end with /v6, but missing due to compatibility reasons
+	"github.com/olivere/elastic/v7"
 )
 
 func main() {

recipes/mapping/.gitignore

@@ -0,0 +1 @@
+/mapping

recipes/mapping/mapping.go

@@ -19,7 +19,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 const (
@@ -30,23 +30,21 @@ const (
 			"number_of_replicas":0
 		},
 		"mappings":{
-			"_doc":{
-				"properties":{
-					"user":{
-						"type":"keyword"
-					},
-					"message":{
-						"type":"text"
-					},
-					"retweets":{
-						"type":"integer"
-					},
-					"created":{
-						"type":"date"
-					},
-					"attributes":{
-						"type":"object"
-					}
+			"properties":{
+				"user":{
+					"type":"keyword"
+				},
+				"message":{
+					"type":"text"
+				},
+				"retweets":{
+					"type":"integer"
+				},
+				"created":{
+					"type":"date"
+				},
+				"attributes":{
+					"type":"object"
 				}
 			}
 		}
@@ -118,7 +116,6 @@ func main() {
 		}
 		_, err := client.Index().
 			Index(*index).
-			Type("_doc").
 			Id("1").
 			BodyJson(&tweet).
 			Refresh("true").
@@ -132,7 +129,6 @@ func main() {
 	{
 		doc, err := client.Get().
 			Index(*index).
-			Type("_doc").
 			Id("1").
 			Do(context.TODO())
 		if err != nil {

recipes/scroll/scroll.go

@@ -24,14 +24,13 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func main() {
 	var (
 		url   = flag.String("url", "http://localhost:9200", "Elasticsearch URL")
 		index = flag.String("index", "", "Elasticsearch index name")
-		typ   = flag.String("type", "", "Elasticsearch type name")
 		size  = flag.Int("size", 100, "Slice of documents to get per scroll")
 		sniff = flag.Bool("sniff", true, "Enable or disable sniffing")
 	)
@@ -72,11 +71,7 @@ func main() {
 
 		// Prepare the query
 		var query elastic.Query
-		if *typ == "" {
-			query = elastic.NewMatchAllQuery()
-		} else {
-			query = elastic.NewTypeQuery(*typ)
-		}
+		query = elastic.NewMatchAllQuery()
 		svc := client.Scroll(*index).Query(query)
 		for {
 			res, err := svc.Do(ctx)

recipes/sliced_scroll/.gitignore

@@ -0,0 +1 @@
+/sliced_scroll

recipes/sliced_scroll/sliced_scroll.go

@@ -37,14 +37,13 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/olivere/elastic"
+	"github.com/olivere/elastic/v7"
 )
 
 func main() {
 	var (
 		url       = flag.String("url", "http://localhost:9200", "Elasticsearch URL")
 		index     = flag.String("index", "", "Elasticsearch index name")
-		typ       = flag.String("type", "", "Elasticsearch type name")
 		field     = flag.String("field", "", "Slice field (must be numeric)")
 		numSlices = flag.Int("n", 2, "Number of slices to use in parallel")
 		sniff     = flag.Bool("sniff", true, "Enable or disable sniffing")
@@ -89,11 +88,7 @@ func main() {
 
 		// Prepare the query
 		var query elastic.Query
-		if *typ == "" {
-			query = elastic.NewMatchAllQuery()
-		} else {
-			query = elastic.NewTypeQuery(*typ)
-		}
+		query = elastic.NewMatchAllQuery()
 
 		// Prepare the slice
 		sliceQuery := elastic.NewSliceQuery().Id(i).Max(*numSlices)