Switch from x/net/context -> context

Since Go 1.7, context is a standard package. Since Go 1.9, everything that is provided by "x/net/context" is a couple of type aliases to types in "context". Many vendored packages still use x/net/context, so vendor entry remains for now. Signed-off-by: Kir Kolyshkin <[email protected]>
srinivasreddy42 · Apr 23, 2018 · 7d62e40 · 7d62e40
1 parent 5c233cf
commit 7d62e40
Show file tree

Hide file tree

Showing 346 changed files with 369 additions and 426 deletions.
diff --git a/api/server/backend/build/backend.go b/api/server/backend/build/backend.go
@@ -1,6 +1,7 @@
 package build // import "github.com/docker/docker/api/server/backend/build"
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/docker/distribution/reference"
@@ -11,7 +12,6 @@ import (
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // ImageComponent provides an interface for working with images

diff --git a/api/server/httputils/httputils.go b/api/server/httputils/httputils.go
@@ -1,6 +1,7 @@
 package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
+	"context"
 	"io"
 	"mime"
 	"net/http"
@@ -9,7 +10,6 @@ import (
 	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 type contextKey string

diff --git a/api/server/httputils/write_log_stream.go b/api/server/httputils/write_log_stream.go
@@ -1,13 +1,12 @@
 package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/url"
 	"sort"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/pkg/ioutils"

diff --git a/api/server/middleware/cors.go b/api/server/middleware/cors.go
@@ -1,10 +1,10 @@
 package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 // CORSMiddleware injects CORS headers to each request

diff --git a/api/server/middleware/debug.go b/api/server/middleware/debug.go
@@ -2,6 +2,7 @@ package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"bufio"
+	"context"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -10,7 +11,6 @@ import (
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 // DebugRequestMiddleware dumps the request to logger

diff --git a/api/server/middleware/experimental.go b/api/server/middleware/experimental.go
@@ -1,9 +1,8 @@
 package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
+	"context"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 // ExperimentalMiddleware is a the middleware in charge of adding the

diff --git a/api/server/middleware/middleware.go b/api/server/middleware/middleware.go
@@ -1,9 +1,8 @@
 package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
+	"context"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 // Middleware is an interface to allow the use of ordinary functions as Docker API filters.

diff --git a/api/server/middleware/version.go b/api/server/middleware/version.go
@@ -1,13 +1,13 @@
 package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"runtime"
 
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
 )
 
 // VersionMiddleware is a middleware that

diff --git a/api/server/middleware/version_test.go b/api/server/middleware/version_test.go
@@ -1,6 +1,7 @@
 package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
+	"context"
 	"net/http"
 	"net/http/httptest"
 	"runtime"
@@ -9,7 +10,6 @@ import (
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"golang.org/x/net/context"
 )
 
 func TestVersionMiddlewareVersion(t *testing.T) {

diff --git a/api/server/router/build/backend.go b/api/server/router/build/backend.go
@@ -1,9 +1,10 @@
 package build // import "github.com/docker/docker/api/server/router/build"
 
 import (
+	"context"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
-	"golang.org/x/net/context"
 )
 
 // Backend abstracts an image builder whose only purpose is to build an image referenced by an imageID.

diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go
@@ -2,6 +2,7 @@ package build // import "github.com/docker/docker/api/server/router/build"
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -25,7 +26,6 @@ import (
 	units "github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 type invalidIsolationError string

diff --git a/api/server/router/checkpoint/checkpoint_routes.go b/api/server/router/checkpoint/checkpoint_routes.go
@@ -1,12 +1,12 @@
 package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint"
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
 )
 
 func (s *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

diff --git a/api/server/router/container/backend.go b/api/server/router/container/backend.go
@@ -1,10 +1,9 @@
 package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
+	"context"
 	"io"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"

diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go
@@ -1,6 +1,7 @@
 package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -20,7 +21,6 @@ import (
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"golang.org/x/net/websocket"
 )
 

diff --git a/api/server/router/container/copy.go b/api/server/router/container/copy.go
@@ -3,6 +3,7 @@ package container // import "github.com/docker/docker/api/server/router/containe
 import (
 	"compress/flate"
 	"compress/gzip"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"io"
@@ -12,7 +13,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/versions"
 	gddohttputil "github.com/golang/gddo/httputil"
-	"golang.org/x/net/context"
 )
 
 type pathError struct{}

diff --git a/api/server/router/container/exec.go b/api/server/router/container/exec.go
@@ -1,6 +1,7 @@
 package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -13,7 +14,6 @@ import (
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 func (s *containerRouter) getExecByID(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

diff --git a/api/server/router/container/inspect.go b/api/server/router/container/inspect.go
@@ -1,10 +1,10 @@
 package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/docker/docker/api/server/httputils"
-	"golang.org/x/net/context"
 )
 
 // getContainersByName inspects container's configuration and serializes it as json.

diff --git a/api/server/router/debug/debug.go b/api/server/router/debug/debug.go
@@ -1,13 +1,13 @@
 package debug // import "github.com/docker/docker/api/server/router/debug"
 
 import (
+	"context"
 	"expvar"
 	"net/http"
 	"net/http/pprof"
 
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/server/router"
-	"golang.org/x/net/context"
 )
 
 // NewRouter creates a new debug router

diff --git a/api/server/router/debug/debug_routes.go b/api/server/router/debug/debug_routes.go
@@ -1,10 +1,9 @@
 package debug // import "github.com/docker/docker/api/server/router/debug"
 
 import (
+	"context"
 	"net/http"
 	"net/http/pprof"
-
-	"golang.org/x/net/context"
 )
 
 func handlePprof(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

diff --git a/api/server/router/distribution/backend.go b/api/server/router/distribution/backend.go
@@ -1,10 +1,11 @@
 package distribution // import "github.com/docker/docker/api/server/router/distribution"
 
 import (
+	"context"
+
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
 )
 
 // Backend is all the methods that need to be implemented

diff --git a/api/server/router/distribution/distribution_routes.go b/api/server/router/distribution/distribution_routes.go
@@ -1,6 +1,7 @@
 package distribution // import "github.com/docker/docker/api/server/router/distribution"
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"net/http"
@@ -15,7 +16,6 @@ import (
 	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (s *distributionRouter) getDistributionInfo(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

diff --git a/api/server/router/experimental.go b/api/server/router/experimental.go
@@ -1,10 +1,9 @@
 package router // import "github.com/docker/docker/api/server/router"
 
 import (
+	"context"
 	"net/http"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/server/httputils"
 )
 

diff --git a/api/server/router/image/backend.go b/api/server/router/image/backend.go
@@ -1,13 +1,13 @@
 package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
+	"context"
 	"io"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
 )
 
 // Backend is all the methods that need to be implemented

diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go
@@ -1,6 +1,7 @@
 package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -19,7 +20,6 @@ import (
 	"github.com/docker/docker/registry"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // Creates an image from Pull or from Import

diff --git a/api/server/router/local.go b/api/server/router/local.go
@@ -1,10 +1,10 @@
 package router // import "github.com/docker/docker/api/server/router"
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/docker/docker/api/server/httputils"
-	"golang.org/x/net/context"
 )
 
 // RouteWrapper wraps a route with extra functionality.

diff --git a/api/server/router/network/backend.go b/api/server/router/network/backend.go
@@ -1,7 +1,7 @@
 package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"

diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
@@ -1,13 +1,12 @@
 package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"strconv"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"

diff --git a/api/server/router/plugin/backend.go b/api/server/router/plugin/backend.go
@@ -1,14 +1,14 @@
 package plugin // import "github.com/docker/docker/api/server/router/plugin"
 
 import (
+	"context"
 	"io"
 	"net/http"
 
 	"github.com/docker/distribution/reference"
 	enginetypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/plugin"
-	"golang.org/x/net/context"
 )
 
 // Backend for Plugin