From bbe14f0a2eaca2bc2c84dfe4cd395fc184ca3830 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 23 Apr 2018 18:58:46 -0700 Subject: [PATCH] Switch from x/net/context to context Since Go 1.7, context is a standard package, superceding the "x/net/context". Since Go 1.9, the latter only provides a few type aliases from the former. Therefore, it makes sense to switch to the standard package. This commit was generated by the following script (with a couple of minor fixups to remove extra changes done by goimports): #!/bin/bash if [ $# -ge 1 ]; then FILES=$* else FILES=$(git ls-files \*.go | grep -vF ".pb.go" | grep -v ^vendor/) fi for f in $FILES; do printf . sed -i -e 's|"golang.org/x/net/context"$|"context"|' $f goimports -w $f awk ' /^$/ {e=1; next;} /[[:space:]]"context"$/ {e=0;} {if (e) {print ""; e=0}; print;}' < $f > $f.new && \ mv $f.new $f goimports -w $f done echo Signed-off-by: Kir Kolyshkin --- cmd/ctr/commands/shim/shim.go | 3 +-- grpc.go | 3 ++- leases/grpc.go | 3 ++- metrics/cgroups/cgroups.go | 3 ++- namespaces/grpc.go | 3 ++- rootfs/apply.go | 2 +- rootfs/diff.go | 2 +- server/server.go | 2 +- server/server_test.go | 2 +- services/containers/local.go | 3 ++- services/containers/service.go | 3 ++- services/content/service.go | 2 +- services/diff/local.go | 3 ++- services/diff/service.go | 3 ++- services/events/service.go | 3 ++- services/images/service.go | 3 ++- services/introspection/service.go | 3 ++- services/leases/local.go | 2 +- services/leases/service.go | 3 ++- services/namespaces/local.go | 2 +- services/namespaces/service.go | 3 ++- services/tasks/local.go | 2 +- services/tasks/service.go | 3 ++- services/version/service.go | 3 ++- 24 files changed, 39 insertions(+), 25 deletions(-) diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index b40dd1db9..988299e03 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -19,12 +19,11 @@ package shim import ( + gocontext "context" "fmt" "io/ioutil" "net" - gocontext "context" - "github.com/containerd/console" "github.com/containerd/containerd/cmd/ctr/commands" shim "github.com/containerd/containerd/linux/shim/v1" diff --git a/grpc.go b/grpc.go index 05fd5cca2..c3506d735 100644 --- a/grpc.go +++ b/grpc.go @@ -17,8 +17,9 @@ package containerd import ( + "context" + "github.com/containerd/containerd/namespaces" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/leases/grpc.go b/leases/grpc.go index 284924e7d..22f287a8b 100644 --- a/leases/grpc.go +++ b/leases/grpc.go @@ -17,7 +17,8 @@ package leases import ( - "golang.org/x/net/context" + "context" + "google.golang.org/grpc/metadata" ) diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index 9fbfa756c..86a2b8e8d 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -19,6 +19,8 @@ package cgroups import ( + "context" + "github.com/containerd/cgroups" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/events" @@ -30,7 +32,6 @@ import ( "github.com/containerd/containerd/runtime" metrics "github.com/docker/go-metrics" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Config for the cgroups monitor diff --git a/namespaces/grpc.go b/namespaces/grpc.go index fe1ca1d7c..6991460da 100644 --- a/namespaces/grpc.go +++ b/namespaces/grpc.go @@ -17,7 +17,8 @@ package namespaces import ( - "golang.org/x/net/context" + "context" + "google.golang.org/grpc/metadata" ) diff --git a/rootfs/apply.go b/rootfs/apply.go index 73613337d..408b4f3a9 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -17,6 +17,7 @@ package rootfs import ( + "context" "crypto/rand" "encoding/base64" "fmt" @@ -30,7 +31,6 @@ import ( "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "golang.org/x/net/context" ) // Layer represents the descriptors for a layer diff. These descriptions diff --git a/rootfs/diff.go b/rootfs/diff.go index c7f954e9f..b3e6ba8a3 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -17,13 +17,13 @@ package rootfs import ( + "context" "fmt" "github.com/containerd/containerd/diff" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "golang.org/x/net/context" ) // CreateDiff creates a layer diff for the given snapshot identifier from the diff --git a/server/server.go b/server/server.go index 59c74d08b..8bf0381f5 100644 --- a/server/server.go +++ b/server/server.go @@ -17,6 +17,7 @@ package server import ( + "context" "expvar" "io" "net" @@ -37,7 +38,6 @@ import ( metrics "github.com/docker/go-metrics" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/server/server_test.go b/server/server_test.go index 9d26bc7d2..3ba95e7b9 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -17,11 +17,11 @@ package server import ( + "context" "testing" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestNewErrorsWithSamePathForRootAndState(t *testing.T) { diff --git a/services/containers/local.go b/services/containers/local.go index 1e59da6c3..424bc21e6 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -17,6 +17,8 @@ package containers import ( + "context" + "github.com/boltdb/bolt" eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/containers/v1" @@ -27,7 +29,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/containers/service.go b/services/containers/service.go index f25c0b0ff..89c072cbb 100644 --- a/services/containers/service.go +++ b/services/containers/service.go @@ -17,12 +17,13 @@ package containers import ( + "context" + api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/content/service.go b/services/content/service.go index 9038e168a..b615e3aa0 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -17,6 +17,7 @@ package content import ( + "context" "io" "sync" @@ -30,7 +31,6 @@ import ( digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/diff/local.go b/services/diff/local.go index 0b90dc271..0cb6222c5 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -17,6 +17,8 @@ package diff import ( + "context" + diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" @@ -26,7 +28,6 @@ import ( "github.com/containerd/containerd/services" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/diff/service.go b/services/diff/service.go index e12c4a062..369e8f84d 100644 --- a/services/diff/service.go +++ b/services/diff/service.go @@ -17,11 +17,12 @@ package diff import ( + "context" + diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/events/service.go b/services/events/service.go index 58a0d02f5..d620cbf02 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -17,6 +17,8 @@ package events import ( + "context" + api "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -24,7 +26,6 @@ import ( "github.com/containerd/containerd/plugin" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/images/service.go b/services/images/service.go index a025c66c9..83d802140 100644 --- a/services/images/service.go +++ b/services/images/service.go @@ -17,12 +17,13 @@ package images import ( + "context" + imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/introspection/service.go b/services/introspection/service.go index 014ac0ed0..bc5913bd7 100644 --- a/services/introspection/service.go +++ b/services/introspection/service.go @@ -17,6 +17,8 @@ package introspection import ( + context "context" + api "github.com/containerd/containerd/api/services/introspection/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" @@ -24,7 +26,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/gogo/googleapis/google/rpc" ptypes "github.com/gogo/protobuf/types" - context "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/services/leases/local.go b/services/leases/local.go index d3e0c2f2c..1b3a62112 100644 --- a/services/leases/local.go +++ b/services/leases/local.go @@ -17,6 +17,7 @@ package leases import ( + "context" "crypto/rand" "encoding/base64" "fmt" @@ -30,7 +31,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" - "golang.org/x/net/context" ) func init() { diff --git a/services/leases/service.go b/services/leases/service.go index e9cccf921..a0a433430 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -17,6 +17,8 @@ package leases import ( + "context" + "google.golang.org/grpc" api "github.com/containerd/containerd/api/services/leases/v1" @@ -24,7 +26,6 @@ import ( "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) func init() { diff --git a/services/namespaces/local.go b/services/namespaces/local.go index dfa86740b..08d21be2b 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -17,6 +17,7 @@ package namespaces import ( + "context" "strings" "github.com/boltdb/bolt" @@ -29,7 +30,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/namespaces/service.go b/services/namespaces/service.go index 965590688..d3c74a2cb 100644 --- a/services/namespaces/service.go +++ b/services/namespaces/service.go @@ -17,12 +17,13 @@ package namespaces import ( + "context" + api "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/tasks/local.go b/services/tasks/local.go index 5bdadab62..49a80d928 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -18,6 +18,7 @@ package tasks import ( "bytes" + "context" "fmt" "io" "io/ioutil" @@ -45,7 +46,6 @@ import ( "github.com/containerd/typeurl" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/tasks/service.go b/services/tasks/service.go index becf1508b..a92a9a07e 100644 --- a/services/tasks/service.go +++ b/services/tasks/service.go @@ -17,12 +17,13 @@ package tasks import ( + "context" + api "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/services/version/service.go b/services/version/service.go index e2da522f5..aaa5d25a7 100644 --- a/services/version/service.go +++ b/services/version/service.go @@ -17,11 +17,12 @@ package version import ( + "context" + api "github.com/containerd/containerd/api/services/version/v1" "github.com/containerd/containerd/plugin" ctrdversion "github.com/containerd/containerd/version" ptypes "github.com/gogo/protobuf/types" - "golang.org/x/net/context" "google.golang.org/grpc" )