Use context from standard library

Bye bye Go 1.8.
yyuuttaaoo · Feb 21, 2018 · c22d7da · c22d7da
1 parent ca33ff2
commit c22d7da
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 30 deletions.
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -18,10 +18,6 @@
   name = "github.com/gorilla/mux"
   version = "v1.5.0"
 
-[[constraint]]
-  name = "golang.org/x/net"
-  branch = "master"
-
 [[override]]
   name = "github.com/Nvveen/Gotty"
   source = "https://github.com/ijc25/Gotty.git"

diff --git a/client.go b/client.go
@@ -10,6 +10,7 @@ package docker
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
@@ -34,8 +35,6 @@ import (
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/stdcopy"
-	"golang.org/x/net/context"
-	"golang.org/x/net/context/ctxhttp"
 )
 
 const (
@@ -224,7 +223,7 @@ func NewVersionedClient(endpoint string, apiVersionString string) (*Client, erro
 
 // WithTransport replaces underlying HTTP client of Docker Client by accepting
 // a function that returns pointer to a transport object.
-func (c *Client) WithTransport(trFunc func () *http.Transport) {
+func (c *Client) WithTransport(trFunc func() *http.Transport) {
 	c.initializeNativeClient(trFunc)
 }
 
@@ -475,7 +474,7 @@ func (c *Client) do(method, path string, doOptions doOptions) (*http.Response, e
 		ctx = context.Background()
 	}
 
-	resp, err := ctxhttp.Do(ctx, c.HTTPClient, req)
+	resp, err := c.HTTPClient.Do(req.WithContext(ctx))
 	if err != nil {
 		if strings.Contains(err.Error(), "connection refused") {
 			return nil, ErrConnectionRefused
@@ -591,7 +590,7 @@ func (c *Client) stream(method, path string, streamOptions streamOptions) error
 			return chooseError(subCtx, err)
 		}
 	} else {
-		if resp, err = ctxhttp.Do(subCtx, c.HTTPClient, req); err != nil {
+		if resp, err = c.HTTPClient.Do(req.WithContext(subCtx)); err != nil {
 			if strings.Contains(err.Error(), "connection refused") {
 				return ErrConnectionRefused
 			}

diff --git a/client_test.go b/client_test.go
@@ -6,6 +6,7 @@ package docker
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -18,8 +19,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestNewAPIClient(t *testing.T) {

diff --git a/container.go b/container.go
@@ -5,6 +5,7 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -16,7 +17,6 @@ import (
 	"time"
 
 	units "github.com/docker/go-units"
-	"golang.org/x/net/context"
 )
 
 // ErrContainerAlreadyExists is the error returned by CreateContainer when the

diff --git a/container_test.go b/container_test.go
@@ -7,6 +7,7 @@ package docker
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -21,8 +22,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestStateString(t *testing.T) {

diff --git a/exec.go b/exec.go
@@ -5,15 +5,14 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
-
-	"golang.org/x/net/context"
 )
 
 // Exec is the type representing a `docker exec` instance and containing the

diff --git a/image.go b/image.go
@@ -6,6 +6,7 @@ package docker
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -16,8 +17,6 @@ import (
 	"os"
 	"strings"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // APIImages represent an image returned in the ListImages call.

diff --git a/network.go b/network.go
@@ -5,12 +5,11 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 // ErrNetworkAlreadyExists is the error returned by CreateNetwork when the

diff --git a/plugin.go b/plugin.go
@@ -5,11 +5,10 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 // PluginPrivilege represents a privilege for a plugin.

diff --git a/swarm.go b/swarm.go
@@ -5,14 +5,14 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"net/http"
 	"net/url"
 	"strconv"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 var (

diff --git a/swarm_configs.go b/swarm_configs.go
@@ -5,13 +5,13 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
 	"strconv"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 // NoSuchConfig is the error returned when a given config does not exist.

diff --git a/swarm_node.go b/swarm_node.go
@@ -5,13 +5,13 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
 	"strconv"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 // NoSuchNode is the error returned when a given node does not exist.

diff --git a/swarm_secrets.go b/swarm_secrets.go
@@ -5,13 +5,13 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
 	"strconv"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 // NoSuchSecret is the error returned when a given secret does not exist.

diff --git a/swarm_service.go b/swarm_service.go
@@ -5,6 +5,7 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -13,7 +14,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 // NoSuchService is the error returned when a given service does not exist.

diff --git a/swarm_task.go b/swarm_task.go
@@ -5,11 +5,11 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
 	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
 )
 
 // NoSuchTask is the error returned when a given task does not exist.

diff --git a/volume.go b/volume.go
@@ -5,11 +5,10 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 var (