Skip to content

Commit 2215238

Browse files
karmikarmi
committed
Update the package import path to use a "v8" suffix
Using the "Major Branch" approach as per https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher
1 parent 6211c3d commit 2215238

Some content is hidden

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

60 files changed

+113
-121
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test-integ: ## Run integration tests
2020
ifdef race
2121
$(eval testintegargs += "-race")
2222
endif
23-
$(eval testintegargs += "-cover" "-coverprofile=tmp/integration-client.cov" "-tags='integration'" "-timeout=1h" "github.com/elastic/go-elasticsearch" "github.com/elastic/go-elasticsearch/estransport")
23+
$(eval testintegargs += "-cover" "-coverprofile=tmp/integration-client.cov" "-tags='integration'" "-timeout=1h" "github.com/elastic/go-elasticsearch/v8" "github.com/elastic/go-elasticsearch/v8/estransport")
2424
@mkdir -p tmp
2525
@if which gotestsum > /dev/null 2>&1 ; then \
2626
echo "gotestsum --format=short-verbose --junitfile=tmp/integration-report.xml --" $(testintegargs); \
@@ -35,7 +35,7 @@ test-api: ## Run generated API integration tests
3535
ifdef race
3636
$(eval testapiargs += "-race")
3737
endif
38-
$(eval testapiargs += "-cover" "-coverpkg=github.com/elastic/go-elasticsearch/esapi" "-coverprofile=$(PWD)/tmp/integration-api.cov" "-tags='integration'" "-timeout=1h" "./...")
38+
$(eval testapiargs += "-cover" "-coverpkg=github.com/elastic/go-elasticsearch/v8/esapi" "-coverprofile=$(PWD)/tmp/integration-api.cov" "-tags='integration'" "-timeout=1h" "./...")
3939
@mkdir -p tmp
4040
@if which gotestsum > /dev/null 2>&1 ; then \
4141
echo "cd esapi/test && gotestsum --format=short-verbose --junitfile=$(PWD)/tmp/integration-api-report.xml --" $(testapiargs); \

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ We encourage you to try the package in your projects, just keep these caveats in
2121

2222
Install the package with `go get`:
2323

24-
go get -u github.com/elastic/go-elasticsearch
24+
go get -u github.com/elastic/go-elasticsearch@master
2525

2626
Or, add the package to your `go.mod` file:
2727

28-
require github.com/elastic/go-elasticsearch master
28+
require github.com/elastic/go-elasticsearch/v8 master
2929

3030
Or, clone the repository:
3131

@@ -39,7 +39,7 @@ mkdir my-elasticsearch-app && cd my-elasticsearch-app
3939
cat > go.mod <<-END
4040
module my-elasticsearch-app
4141
42-
require github.com/elastic/go-elasticsearch master
42+
require github.com/elastic/go-elasticsearch/v8 master
4343
END
4444

4545
cat > main.go <<-END
@@ -48,7 +48,7 @@ cat > main.go <<-END
4848
import (
4949
"log"
5050
51-
"github.com/elastic/go-elasticsearch"
51+
"github.com/elastic/go-elasticsearch/v8"
5252
)
5353
5454
func main() {
@@ -144,8 +144,8 @@ import (
144144
"strings"
145145
"sync"
146146

147-
"github.com/elastic/go-elasticsearch"
148-
"github.com/elastic/go-elasticsearch/esapi"
147+
"github.com/elastic/go-elasticsearch/v8"
148+
"github.com/elastic/go-elasticsearch/v8/esapi"
149149
)
150150

151151
func main() {

‎_examples/bulk/bulk.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"strings"
2727
"time"
2828

29-
"github.com/elastic/go-elasticsearch"
30-
"github.com/elastic/go-elasticsearch/esapi"
29+
"github.com/elastic/go-elasticsearch/v8"
30+
"github.com/elastic/go-elasticsearch/v8/esapi"
3131
)
3232

3333
type Article struct {

‎_examples/cloudfunction/function.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
//
1515
// $ curl https://...cloudfunctions.net/clusterstatus
1616
//
17-
package clusterstatus // import "github.com/elastic/go-elasticsearch/_examples/clusterstatus"
17+
package clusterstatus // import "github.com/elastic/go-elasticsearch/v8/_examples/clusterstatus"
1818

1919
import (
2020
"encoding/json"
2121
"fmt"
2222
"log"
2323
"net/http"
2424

25-
"github.com/elastic/go-elasticsearch"
25+
"github.com/elastic/go-elasticsearch/v8"
2626
)
2727

2828
// ES holds a reference to the Elasticsearch client

‎_examples/cloudfunction/function_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/elastic/go-elasticsearch"
11+
"github.com/elastic/go-elasticsearch/v8"
1212

13-
"github.com/elastic/go-elasticsearch/_examples/clusterstatus"
13+
"github.com/elastic/go-elasticsearch/v8/_examples/clusterstatus"
1414
)
1515

1616
// Mock transport replaces the HTTP transport for tests

‎_examples/cloudfunction/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
module github.com/elastic/go-elasticsearch/_examples/clusterstatus
1+
module github.com/elastic/go-elasticsearch/v8/_examples/clusterstatus
22

33
go 1.11
44

5-
replace github.com/elastic/go-elasticsearch => ../..
5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
66

7-
require github.com/elastic/go-elasticsearch master
7+
require github.com/elastic/go-elasticsearch/v8 master

‎_examples/configuration.go

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

12-
"github.com/elastic/go-elasticsearch"
12+
"github.com/elastic/go-elasticsearch/v8"
1313
)
1414

1515
func main() {

‎_examples/customization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sync"
1212
"sync/atomic"
1313

14-
"github.com/elastic/go-elasticsearch"
14+
"github.com/elastic/go-elasticsearch/v8"
1515
)
1616

1717
// This example demonstrates how to provide a custom transport implementation to the client

‎_examples/encoding/benchmark_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/mailru/easyjson"
1111
"github.com/tidwall/gjson"
1212

13-
"github.com/elastic/go-elasticsearch/_examples/encoding/model"
13+
"github.com/elastic/go-elasticsearch/v8/_examples/encoding/model"
1414
)
1515

1616
func BenchmarkSearchResults(b *testing.B) {

‎_examples/encoding/easyjson.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/elastic/go-elasticsearch"
13-
"github.com/elastic/go-elasticsearch/esapi"
12+
"github.com/elastic/go-elasticsearch/v8"
13+
"github.com/elastic/go-elasticsearch/v8/esapi"
1414
"github.com/fatih/color"
1515
"github.com/mailru/easyjson"
1616

17-
"github.com/elastic/go-elasticsearch/_examples/encoding/model"
17+
"github.com/elastic/go-elasticsearch/v8/_examples/encoding/model"
1818
)
1919

2020
var (

‎_examples/encoding/gjson.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"log"
88
"strings"
99

10-
"github.com/elastic/go-elasticsearch"
10+
"github.com/elastic/go-elasticsearch/v8"
1111
"github.com/fatih/color"
1212
"github.com/tidwall/gjson"
1313
)

‎_examples/encoding/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
module github.com/elastic/go-elasticsearch/_examples/encoding
1+
module github.com/elastic/go-elasticsearch/v8/_examples/encoding
22

33
go 1.11
44

5-
replace github.com/elastic/go-elasticsearch => ../..
5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
66

77
require (
8-
github.com/elastic/go-elasticsearch v0.0.1-0.20190316081522-60ea51fd3784
8+
github.com/elastic/go-elasticsearch/v8 master
99

1010
github.com/fatih/color v1.7.0
1111

‎_examples/fasthttp/cmd/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strconv"
88
"time"
99

10-
"github.com/elastic/go-elasticsearch"
11-
"github.com/elastic/go-elasticsearch/_examples/fasthttp"
10+
"github.com/elastic/go-elasticsearch/v8"
11+
"github.com/elastic/go-elasticsearch/v8/_examples/fasthttp"
1212
)
1313

1414
var (

‎_examples/fasthttp/fasthttp_benchmark_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package fasthttp_test
33
import (
44
"testing"
55

6-
"github.com/elastic/go-elasticsearch"
7-
"github.com/elastic/go-elasticsearch/_examples/fasthttp"
6+
"github.com/elastic/go-elasticsearch/v8"
7+
"github.com/elastic/go-elasticsearch/v8/_examples/fasthttp"
88
)
99

1010
func BenchmarkHTTPClient(b *testing.B) {

‎_examples/fasthttp/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module github.com/elastic/go-elasticsearch/_examples/fasthttp
1+
module github.com/elastic/go-elasticsearch/v8/_examples/fasthttp
22

33
go 1.11
44

5-
replace github.com/elastic/go-elasticsearch => ../..
5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
66

77
require (
8-
github.com/elastic/go-elasticsearch master
8+
github.com/elastic/go-elasticsearch/v8 master
99
github.com/valyala/fasthttp v1.1.0
1010
)

‎_examples/instrumentation/apmelasticsearch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/fatih/color"
1919
"golang.org/x/crypto/ssh/terminal"
2020

21-
"github.com/elastic/go-elasticsearch"
21+
"github.com/elastic/go-elasticsearch/v8"
2222

2323
"go.elastic.co/apm"
2424
"go.elastic.co/apm/module/apmelasticsearch"

‎_examples/instrumentation/go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
module github.com/elastic/go-elasticsearch/_examples/instrumentation/opencensus
1+
module github.com/elastic/go-elasticsearch/v8/_examples/instrumentation/opencensus
22

33
go 1.11
44

5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
6+
57
require (
6-
github.com/elastic/go-elasticsearch master
8+
github.com/elastic/go-elasticsearch/v8 master
79

810
github.com/fatih/color v1.7.0
911
github.com/mattn/go-colorable v0.1.0 // indirect

‎_examples/instrumentation/opencensus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/fatih/color"
1515
"golang.org/x/crypto/ssh/terminal"
1616

17-
"github.com/elastic/go-elasticsearch"
17+
"github.com/elastic/go-elasticsearch/v8"
1818

1919
"go.opencensus.io/plugin/ochttp"
2020
"go.opencensus.io/stats/view"

‎_examples/logging/custom.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/rs/zerolog"
1717

18-
"github.com/elastic/go-elasticsearch"
18+
"github.com/elastic/go-elasticsearch/v8"
1919
)
2020

2121
// CustomLogger implements the estransport.Logger interface.

‎_examples/logging/default.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"os"
1515
"strings"
1616

17-
"github.com/elastic/go-elasticsearch"
18-
"github.com/elastic/go-elasticsearch/estransport"
17+
"github.com/elastic/go-elasticsearch/v8"
18+
"github.com/elastic/go-elasticsearch/v8/estransport"
1919
)
2020

2121
func main() {

‎_examples/logging/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
module github.com/elastic/go-elasticsearch/_examples/logging
1+
module github.com/elastic/go-elasticsearch/v8/_examples/logging
22

33
go 1.11
44

5-
replace github.com/elastic/go-elasticsearch => ../..
5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
66

77
require (
8-
github.com/elastic/go-elasticsearch master
8+
github.com/elastic/go-elasticsearch/v8 master
99

1010
github.com/rs/zerolog v1.11.0
1111
)

‎_examples/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"strings"
1616
"sync"
1717

18-
"github.com/elastic/go-elasticsearch"
19-
"github.com/elastic/go-elasticsearch/esapi"
18+
"github.com/elastic/go-elasticsearch/v8"
19+
"github.com/elastic/go-elasticsearch/v8/esapi"
2020
)
2121

2222
func main() {

‎_examples/xkcdsearch/cmd/xkcd/commands/index.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/rs/zerolog"
1515
"github.com/spf13/cobra"
1616

17-
"github.com/elastic/go-elasticsearch"
17+
"github.com/elastic/go-elasticsearch/v8"
1818

19-
"github.com/elastic/go-elasticsearch/_examples/xkcdsearch"
19+
"github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch"
2020
)
2121

2222
var (

‎_examples/xkcdsearch/cmd/xkcd/commands/search.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/spf13/cobra"
1111

12-
"github.com/elastic/go-elasticsearch"
12+
"github.com/elastic/go-elasticsearch/v8"
1313

14-
"github.com/elastic/go-elasticsearch/_examples/xkcdsearch"
14+
"github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch"
1515
)
1616

1717
func init() {

‎_examples/xkcdsearch/cmd/xkcd/commands/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/rs/zerolog"
88
"github.com/spf13/cobra"
99

10-
"github.com/elastic/go-elasticsearch"
10+
"github.com/elastic/go-elasticsearch/v8"
1111

12-
"github.com/elastic/go-elasticsearch/_examples/xkcdsearch"
12+
"github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch"
1313
)
1414

1515
var (

‎_examples/xkcdsearch/cmd/xkcd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package main
22

3-
import "github.com/elastic/go-elasticsearch/_examples/xkcdsearch/cmd/xkcd/commands"
3+
import "github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch/cmd/xkcd/commands"
44

55
func main() {
66
commands.Execute()

‎_examples/xkcdsearch/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
module github.com/elastic/go-elasticsearch/_examples/xkcdsearch
1+
module github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch
22

33
go 1.11
44

5-
replace github.com/elastic/go-elasticsearch => ../..
5+
replace github.com/elastic/go-elasticsearch/v8 => ../..
66

77
require (
8-
github.com/elastic/go-elasticsearch master
8+
github.com/elastic/go-elasticsearch/v8 master
99
github.com/inconshreveable/mousetrap v1.0.0 // indirect
1010
github.com/rs/zerolog v1.11.0
1111
github.com/spf13/cobra v0.0.3

‎_examples/xkcdsearch/store.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"io"
99
"strings"
1010

11-
"github.com/elastic/go-elasticsearch"
12-
"github.com/elastic/go-elasticsearch/esapi"
11+
"github.com/elastic/go-elasticsearch/v8"
12+
"github.com/elastic/go-elasticsearch/v8/esapi"
1313
)
1414

1515
// SearchResults wraps the Elasticsearch search response.

‎_examples/xkcdsearch/store_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"strings"
1212
"testing"
1313

14-
"github.com/elastic/go-elasticsearch"
14+
"github.com/elastic/go-elasticsearch/v8"
1515

16-
"github.com/elastic/go-elasticsearch/_examples/xkcdsearch"
16+
"github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch"
1717
)
1818

1919
var (

‎_examples/xkcdsearch/xkcd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xkcdsearch // import "github.com/elastic/go-elasticsearch/_examples/xkcdsearch"
1+
package xkcdsearch // import "github.com/elastic/go-elasticsearch/v8/_examples/xkcdsearch"
22

33
import (
44
"strings"

0 commit comments

Comments
 (0)