Switch to stdlib context package (go1.8+)

See olivere#425

bulk.go

@@ -6,12 +6,11 @@ package elastic
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"net/url"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

bulk_processor.go

@@ -5,11 +5,10 @@
 package elastic
 
 import (
+	"context"
 	"sync"
 	"sync/atomic"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // BulkProcessorService allows to easily process bulk requests. It allows setting

bulk_processor_test.go

@@ -5,13 +5,12 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"sync/atomic"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestBulkProcessorDefaults(t *testing.T) {

bulk_test.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	"encoding/json"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestBulk(t *testing.T) {

clear_scroll.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 // ClearScrollService clears one or more scroll contexts by their ids.

clear_scroll_test.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	_ "net/http"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestClearScroll(t *testing.T) {

client.go

@@ -6,6 +6,7 @@ package elastic
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -17,7 +18,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/net/context/ctxhttp"
 )
 

client_test.go

@@ -6,6 +6,7 @@ package elastic
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,8 +16,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func findConn(s string, slice ...*conn) (int, bool) {

cluster-test/cluster-test.go

@@ -5,6 +5,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"flag"
@@ -17,8 +18,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/net/context"
-
 	elastic "gopkg.in/olivere/elastic.v5"
 )
 

cluster_health.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

cluster_health_test.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	"net/url"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestClusterHealth(t *testing.T) {

cluster_state.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

cluster_state_test.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	"net/url"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestClusterState(t *testing.T) {

cluster_stats.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

cluster_stats_test.go

@@ -5,10 +5,9 @@
 package elastic
 
 import (
+	"context"
 	"net/url"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestClusterStats(t *testing.T) {

count.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

count_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestCountURL(t *testing.T) {

decoder_test.go

@@ -6,11 +6,10 @@ package elastic
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"sync/atomic"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 type decoder struct {

delete.go

@@ -5,11 +5,10 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

delete_by_query.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

delete_by_query_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestDeleteByQueryBuildURL(t *testing.T) {

delete_template.go

@@ -5,11 +5,10 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

delete_template_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestDeleteTemplateValidate(t *testing.T) {

delete_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestDelete(t *testing.T) {

example_test.go

@@ -5,15 +5,14 @@
 package elastic_test
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"log"
 	"os"
 	"reflect"
 	"time"
 
-	"golang.org/x/net/context"
-
 	elastic "gopkg.in/olivere/elastic.v5"
 )
 

exists.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

exists_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestExists(t *testing.T) {

explain.go

@@ -5,12 +5,11 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )
 

explain_test.go

@@ -5,9 +5,8 @@
 package elastic
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestExplain(t *testing.T) {

field_stats.go

@@ -5,13 +5,12 @@
 package elastic
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"gopkg.in/olivere/elastic.v5/uritemplates"
 )