diff options
| author |  Miek Gieben <miek@miek.nl>
| 2018-04-20 11:01:06 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-04-20 11:01:06 +0100 |
| commit | 8722336fff479e00900e3299f31063a9d1a76e9a (patch) | |
| tree | deb3d99aeae1d8543a3dbfd20bc36b4ef7daff1b /plugin/cache | |
| parent | 61726b3721b6049f436841fe4c5f7db48d5a39d0 (diff) | |
| download | coredns-8722336fff479e00900e3299f31063a9d1a76e9a.tar.gz coredns-8722336fff479e00900e3299f31063a9d1a76e9a.tar.zst coredns-8722336fff479e00900e3299f31063a9d1a76e9a.zip | |
global: move to context (#1699)
* global: move to context
Move from golang.org/x/net/context to std lib's context.
Change done with:
for i in $(grep -l '/context' **/*.go); do sed -e 's|golang.org/x/net/context|context|' -i $i; echo $i; done
for i in **/*.go; do goimports -w $i; done
* drop from dns.pb.go as well
Diffstat (limited to 'plugin/cache')
| -rw-r--r-- | plugin/cache/cache_test.go | 2 | ||||
| -rw-r--r-- | plugin/cache/handler.go | 3 | ||||
| -rw-r--r-- | plugin/cache/prefech_test.go | 3 | ||||
| -rw-r--r-- | plugin/cache/spoof_test.go | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/plugin/cache/cache_test.go b/plugin/cache/cache_test.go index 6c28be26f..0531d1c33 100644 --- a/plugin/cache/cache_test.go +++ b/plugin/cache/cache_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "golang.org/x/net/context" + "context" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/response" diff --git a/plugin/cache/handler.go b/plugin/cache/handler.go index c2efdc9c7..988b13c4a 100644 --- a/plugin/cache/handler.go +++ b/plugin/cache/handler.go @@ -8,9 +8,10 @@ import ( "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/request" + "context" + "github.com/miekg/dns" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/net/context" ) // ServeDNS implements the plugin.Handler interface. diff --git a/plugin/cache/prefech_test.go b/plugin/cache/prefech_test.go index 1cd0758fb..1f32396e1 100644 --- a/plugin/cache/prefech_test.go +++ b/plugin/cache/prefech_test.go @@ -8,9 +8,10 @@ import ( "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnstest" + "context" + "github.com/coredns/coredns/plugin/test" "github.com/miekg/dns" - "golang.org/x/net/context" ) func TestPrefetch(t *testing.T) { diff --git a/plugin/cache/spoof_test.go b/plugin/cache/spoof_test.go index c90aee817..a855d8fab 100644 --- a/plugin/cache/spoof_test.go +++ b/plugin/cache/spoof_test.go @@ -6,9 +6,10 @@ import ( "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnstest" + "context" + "github.com/coredns/coredns/plugin/test" "github.com/miekg/dns" - "golang.org/x/net/context" ) func TestSpoof(t *testing.T) { |