all: fix plugin import ordering (#1717)

Got a bit messed up with stb lib "context" usage.

plugin/auto/auto.go

@@ -2,6 +2,7 @@
 package auto
 
 import (
+	"context"
 	"regexp"
 	"time"
 
@@ -11,8 +12,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/autopath/autopath.go

@@ -32,13 +32,13 @@ func (m Plugins ) AutoPath(state request.Request) []string {
 package autopath
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/nonwriter"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/autopath/autopath_test.go

@@ -1,14 +1,13 @@
 package autopath
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/backend.go

@@ -1,12 +1,12 @@
 package plugin
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin/etcd/msg"
 	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
-
-	"context"
 )
 
 // ServiceBackend defines a (dynamic) backend that returns a slice of service definitions.

plugin/cache/cache_test.go

@@ -1,11 +1,10 @@
 package cache
 
 import (
+	"context"
 	"testing"
 	"time"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/response"
 	"github.com/coredns/coredns/plugin/test"

plugin/cache/handler.go

@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"context"
 	"math"
 	"sync"
 	"time"
@@ -8,8 +9,6 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
 )

plugin/cache/prefech_test.go

@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
@@ -8,8 +9,6 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/miekg/dns"
 )

plugin/cache/spoof_test.go

@@ -1,13 +1,12 @@
 package cache
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/miekg/dns"
 )

plugin/chaos/chaos.go

@@ -2,13 +2,12 @@
 package chaos
 
 import (
+	"context"
 	"os"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/chaos/chaos_test.go

@@ -1,14 +1,13 @@
 package chaos
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/dnssec/handler.go

@@ -1,13 +1,12 @@
 package dnssec
 
 import (
+	"context"
 	"sync"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
 )

plugin/dnssec/handler_test.go

@@ -1,6 +1,7 @@
 package dnssec
 
 import (
+	"context"
 	"strings"
 	"testing"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/dnstap/handler.go

@@ -1,13 +1,12 @@
 package dnstap
 
 import (
+	"context"
 	"time"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/dnstap/taprw"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )

plugin/dnstap/handler_test.go

@@ -1,6 +1,7 @@
 package dnstap
 
 import (
+	"context"
 	"errors"
 	"net"
 	"strings"
@@ -9,9 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/dnstap/test"
 	mwtest "github.com/coredns/coredns/plugin/test"
-
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )

plugin/dnstap/test/helpers.go

@@ -1,13 +1,12 @@
 package test
 
 import (
+	"context"
 	"net"
 	"reflect"
 
 	"github.com/coredns/coredns/plugin/dnstap/msg"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 )
 

plugin/erratic/erratic.go

@@ -2,13 +2,12 @@
 package erratic
 
 import (
+	"context"
 	"sync/atomic"
 	"time"
 
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/erratic/erratic_test.go

@@ -1,13 +1,12 @@
 package erratic
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/errors/errors.go

@@ -2,6 +2,7 @@
 package errors
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"runtime"
@@ -11,8 +12,6 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/errors/errors_test.go

@@ -2,6 +2,7 @@ package errors
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"log"
@@ -12,8 +13,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/etcd/etcd.go

@@ -2,6 +2,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"

plugin/etcd/handler.go

@@ -1,12 +1,12 @@
 package etcd
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/etcd/lookup_test.go

@@ -3,6 +3,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"testing"
 	"time"
@@ -14,8 +15,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"
 )

plugin/etcd/setup.go

@@ -1,6 +1,7 @@
 package etcd
 
 import (
+	"context"
 	"crypto/tls"
 
 	"github.com/coredns/coredns/core/dnsserver"
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/plugin/proxy"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/mholt/caddy"
 )

plugin/etcd/stub_handler.go

@@ -1,13 +1,12 @@
 package etcd
 
 import (
+	"context"
 	"errors"
 
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/etcd/xfr.go

@@ -1,11 +1,11 @@
 package etcd
 
 import (
+	"context"
 	"time"
 
-	"context"
-
 	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )
 

plugin/federation/federation.go

@@ -14,14 +14,14 @@ Federation is only useful in conjunction with the kubernetes plugin, without it
 package federation
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/etcd/msg"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/nonwriter"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/federation/federation_test.go

@@ -1,14 +1,13 @@
 package federation
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/kubernetes"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/cname_test.go

@@ -1,6 +1,7 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
@@ -8,8 +9,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/delegation_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/dname_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/dnssec_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/ds_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/ent_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/file.go

@@ -2,6 +2,7 @@
 package file
 
 import (
+	"context"
 	"fmt"
 	"io"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/glue_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/lookup_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/wildcard_test.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/file/xfr.go

@@ -1,14 +1,13 @@
 package file
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/forward/connect.go

@@ -5,6 +5,7 @@
 package forward
 
 import (
+	"context"
 	"io"
 	"strconv"
 	"sync/atomic"
@@ -12,8 +13,6 @@ import (
 
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/forward/forward.go

@@ -5,6 +5,7 @@
 package forward
 
 import (
+	"context"
 	"crypto/tls"
 	"errors"
 	"time"
@@ -12,8 +13,6 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 )

plugin/forward/health_test.go

@@ -1,6 +1,7 @@
 package forward
 
 import (
+	"context"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -8,8 +9,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/forward/lookup.go

@@ -5,10 +5,10 @@
 package forward
 
 import (
-	"github.com/coredns/coredns/request"
-
 	"context"
 
+	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )
 

plugin/hosts/hosts.go

@@ -1,14 +1,14 @@
 package hosts
 
 import (
-	"net"
-
 	"context"
+	"net"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/fall"
 	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )
 

plugin/hosts/hosts_test.go

@@ -1,14 +1,13 @@
 package hosts
 
 import (
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/handler.go

@@ -1,12 +1,12 @@
 package kubernetes
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/handler_pod_disabled_test.go

@@ -1,13 +1,12 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/handler_pod_insecure_test.go

@@ -1,13 +1,12 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/handler_pod_verified_test.go

@@ -1,13 +1,12 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/handler_test.go

@@ -1,14 +1,13 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 	"time"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 	api "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"

plugin/kubernetes/kubernetes_apex_test.go

@@ -1,13 +1,12 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/kubernetes/reverse_test.go

@@ -1,13 +1,12 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 	api "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"

plugin/kubernetes/xfr.go

@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"context"
 	"math"
 	"net"
 	"strings"
@@ -10,8 +11,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	api "k8s.io/api/core/v1"
 )

plugin/kubernetes/xfr_test.go

@@ -1,11 +1,10 @@
 package kubernetes
 
 import (
+	"context"
 	"strings"
 	"testing"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 	api "k8s.io/api/core/v1"

plugin/loadbalance/handler.go

@@ -2,10 +2,10 @@
 package loadbalance
 
 import (
-	"github.com/coredns/coredns/plugin"
-
 	"context"
 
+	"github.com/coredns/coredns/plugin"
+
 	"github.com/miekg/dns"
 )
 

plugin/loadbalance/loadbalance_test.go

@@ -1,14 +1,13 @@
 package loadbalance
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/log/log.go

@@ -2,6 +2,7 @@
 package log
 
 import (
+	"context"
 	"log"
 	"time"
 
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/response"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/log/log_test.go

@@ -2,6 +2,7 @@ package log
 
 import (
 	"bytes"
+	"context"
 	"log"
 	"strings"
 	"testing"
@@ -10,8 +11,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/response"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/metrics/context.go

@@ -1,9 +1,9 @@
 package metrics
 
 import (
-	"github.com/coredns/coredns/plugin/metrics/vars"
-
 	"context"
+
+	"github.com/coredns/coredns/plugin/metrics/vars"
 )
 
 // WithServer returns the current server handling the request. It returns the

plugin/metrics/handler.go

@@ -1,14 +1,14 @@
 package metrics
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/metrics/vars"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/pkg/rcode"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/metrics/metrics_test.go

@@ -1,6 +1,7 @@
 package metrics
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
@@ -8,8 +9,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/metrics/vars/report.go

@@ -1,13 +1,12 @@
 package vars
 
 import (
+	"context"
 	"time"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/nsid/nsid.go

@@ -2,12 +2,11 @@
 package nsid
 
 import (
+	"context"
 	"encoding/hex"
 
 	"github.com/coredns/coredns/plugin"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/nsid/nsid_test.go

@@ -1,6 +1,7 @@
 package nsid
 
 import (
+	"context"
 	"encoding/hex"
 	"testing"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/plugin/whoami"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/pkg/fuzz/do.go

@@ -2,11 +2,11 @@
 package fuzz
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/plugin.go

@@ -2,11 +2,10 @@
 package plugin
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
-	"context"
-
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"

plugin/proxy/dns.go

@@ -1,13 +1,12 @@
 package proxy
 
 import (
+	"context"
 	"net"
 	"time"
 
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/proxy/dnstap.go

@@ -1,14 +1,13 @@
 package proxy
 
 import (
+	"context"
 	"time"
 
 	"github.com/coredns/coredns/plugin/dnstap"
 	"github.com/coredns/coredns/plugin/dnstap/msg"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )

plugin/proxy/dnstap_test.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -9,8 +10,6 @@ import (
 	mwtest "github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )

plugin/proxy/exchanger.go

@@ -1,10 +1,10 @@
 package proxy
 
 import (
-	"github.com/coredns/coredns/request"
-
 	"context"
 
+	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )
 

plugin/proxy/google.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -14,8 +15,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/proxy/grpc.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/trace"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/miekg/dns"
 	opentracing "github.com/opentracing/opentracing-go"

plugin/proxy/grpc_test.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	"google.golang.org/grpc/grpclog"
 )

plugin/proxy/lookup.go

@@ -3,6 +3,7 @@ package proxy
 // functions other plugin might want to use to do lookup in the same style as the proxy.
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"sync/atomic"
@@ -11,8 +12,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/healthcheck"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/proxy/proxy.go

@@ -2,6 +2,7 @@
 package proxy
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net"
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/healthcheck"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 )

plugin/reverse/reverse.go

@@ -1,15 +1,13 @@
 package reverse
 
 import (
+	"context"
 	"net"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/fall"
 	"github.com/coredns/coredns/request"
-
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/reverse/reverse_test.go

@@ -1,6 +1,7 @@
 package reverse
 
 import (
+	"context"
 	"net"
 	"regexp"
 	"testing"
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/rewrite/reverter_test.go

@@ -1,14 +1,13 @@
 package rewrite
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/rewrite/rewrite.go

@@ -1,14 +1,13 @@
 package rewrite
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	"github.com/coredns/coredns/plugin"
 
 	"github.com/miekg/dns"
-
-	"context"
 )
 
 // Result is the result of a rewrite

plugin/rewrite/rewrite_test.go

@@ -2,6 +2,7 @@ package rewrite
 
 import (
 	"bytes"
+	"context"
 	"reflect"
 	"testing"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/route53/route53.go

@@ -3,13 +3,12 @@
 package route53
 
 import (
+	"context"
 	"net"
 
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"

plugin/route53/route53_test.go

@@ -1,13 +1,12 @@
 package route53
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"

plugin/template/template.go

@@ -2,6 +2,7 @@ package template
 
 import (
 	"bytes"
+	"context"
 	"regexp"
 	"strconv"
 	gotmpl "text/template"
@@ -11,8 +12,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/template/template_test.go

@@ -1,6 +1,7 @@
 package template
 
 import (
+	"context"
 	"fmt"
 	"regexp"
 	"testing"
@@ -10,8 +11,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/fall"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/mholt/caddy"
 	"github.com/miekg/dns"
 )

plugin/test/helpers.go

@@ -1,11 +1,10 @@
 package test
 
 import (
+	"context"
 	"sort"
 	"testing"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/trace/trace.go

@@ -2,6 +2,7 @@
 package trace
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
@@ -11,8 +12,6 @@ import (
 	// Plugin the trace package.
 	_ "github.com/coredns/coredns/plugin/pkg/trace"
 
-	"context"
-
 	ddtrace "github.com/DataDog/dd-trace-go/opentracing"
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"

plugin/whoami/whoami.go

@@ -3,13 +3,12 @@
 package whoami
 
 import (
+	"context"
 	"net"
 	"strconv"
 
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/whoami/whoami_test.go

@@ -1,13 +1,12 @@
 package whoami
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	"github.com/miekg/dns"
 )