diff options
Diffstat (limited to 'plugin')
106 files changed, 112 insertions, 152 deletions
diff --git a/plugin/acl/acl_test.go b/plugin/acl/acl_test.go index ff3d86e1a..bf0c6f6f7 100644 --- a/plugin/acl/acl_test.go +++ b/plugin/acl/acl_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/test" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/acl/setup.go b/plugin/acl/setup.go index 98327b6b0..d00ec7796 100644 --- a/plugin/acl/setup.go +++ b/plugin/acl/setup.go @@ -4,10 +4,10 @@ import ( "net" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - "github.com/caddyserver/caddy" "github.com/infobloxopen/go-trees/iptree" "github.com/miekg/dns" ) diff --git a/plugin/acl/setup_test.go b/plugin/acl/setup_test.go index f48da3f24..2bf7e778b 100644 --- a/plugin/acl/setup_test.go +++ b/plugin/acl/setup_test.go @@ -3,7 +3,7 @@ package acl import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/any/setup.go b/plugin/any/setup.go index 703b8e5d2..5c8a93b9d 100644 --- a/plugin/any/setup.go +++ b/plugin/any/setup.go @@ -1,10 +1,9 @@ package any import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("any", setup) } diff --git a/plugin/auto/setup.go b/plugin/auto/setup.go index e6495b192..7da3e11a2 100644 --- a/plugin/auto/setup.go +++ b/plugin/auto/setup.go @@ -6,14 +6,13 @@ import ( "regexp" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/metrics" clog "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/upstream" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("auto") diff --git a/plugin/auto/setup_test.go b/plugin/auto/setup_test.go index 528dce23b..e50b8451e 100644 --- a/plugin/auto/setup_test.go +++ b/plugin/auto/setup_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestAutoParse(t *testing.T) { diff --git a/plugin/autopath/setup.go b/plugin/autopath/setup.go index a22105f7d..39beef770 100644 --- a/plugin/autopath/setup.go +++ b/plugin/autopath/setup.go @@ -3,10 +3,10 @@ package autopath import ( "fmt" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/autopath/setup_test.go b/plugin/autopath/setup_test.go index cce855049..5847e0de5 100644 --- a/plugin/autopath/setup_test.go +++ b/plugin/autopath/setup_test.go @@ -6,9 +6,8 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/test" - - "github.com/caddyserver/caddy" ) func TestSetupAutoPath(t *testing.T) { diff --git a/plugin/azure/setup.go b/plugin/azure/setup.go index f3fd6e437..11506be6d 100644 --- a/plugin/azure/setup.go +++ b/plugin/azure/setup.go @@ -4,6 +4,7 @@ import ( "context" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/fall" @@ -13,7 +14,6 @@ import ( privateAzureDNS "github.com/Azure/azure-sdk-for-go/profiles/latest/privatedns/mgmt/privatedns" azurerest "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/azure/auth" - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("azure") diff --git a/plugin/azure/setup_test.go b/plugin/azure/setup_test.go index a8df18cd7..c6c26b17b 100644 --- a/plugin/azure/setup_test.go +++ b/plugin/azure/setup_test.go @@ -3,7 +3,7 @@ package azure import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/bind/setup.go b/plugin/bind/setup.go index 84466eb67..44c9b8a6f 100644 --- a/plugin/bind/setup.go +++ b/plugin/bind/setup.go @@ -4,10 +4,9 @@ import ( "fmt" "net" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func setup(c *caddy.Controller) error { diff --git a/plugin/bind/setup_test.go b/plugin/bind/setup_test.go index 1d85e9562..556aa1ea2 100644 --- a/plugin/bind/setup_test.go +++ b/plugin/bind/setup_test.go @@ -3,9 +3,8 @@ package bind import ( "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - - "github.com/caddyserver/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/bufsize/setup.go b/plugin/bufsize/setup.go index 28586c76e..7ac602d5d 100644 --- a/plugin/bufsize/setup.go +++ b/plugin/bufsize/setup.go @@ -3,10 +3,9 @@ package bufsize import ( "strconv" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("bufsize", setup) } diff --git a/plugin/bufsize/setup_test.go b/plugin/bufsize/setup_test.go index 4d1705a05..bb103027d 100644 --- a/plugin/bufsize/setup_test.go +++ b/plugin/bufsize/setup_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupBufsize(t *testing.T) { diff --git a/plugin/cache/setup.go b/plugin/cache/setup.go index 97493eb77..d936db895 100644 --- a/plugin/cache/setup.go +++ b/plugin/cache/setup.go @@ -6,12 +6,11 @@ import ( "strconv" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/cache" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("cache") diff --git a/plugin/cache/setup_test.go b/plugin/cache/setup_test.go index 6352bcadb..875af7d03 100644 --- a/plugin/cache/setup_test.go +++ b/plugin/cache/setup_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/cancel/cancel.go b/plugin/cancel/cancel.go index 9ded73e82..23f5de415 100644 --- a/plugin/cancel/cancel.go +++ b/plugin/cancel/cancel.go @@ -6,10 +6,10 @@ import ( "fmt" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/cancel/setup_test.go b/plugin/cancel/setup_test.go index d79390254..6079ff5e1 100644 --- a/plugin/cancel/setup_test.go +++ b/plugin/cancel/setup_test.go @@ -3,7 +3,7 @@ package cancel import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/chaos/setup.go b/plugin/chaos/setup.go index 42ce76b4f..de3622fe5 100644 --- a/plugin/chaos/setup.go +++ b/plugin/chaos/setup.go @@ -5,10 +5,9 @@ package chaos import ( "sort" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("chaos", setup) } diff --git a/plugin/chaos/setup_test.go b/plugin/chaos/setup_test.go index 647d63f6c..2c45d86d8 100644 --- a/plugin/chaos/setup_test.go +++ b/plugin/chaos/setup_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupChaos(t *testing.T) { diff --git a/plugin/clouddns/setup.go b/plugin/clouddns/setup.go index 3b6bcba5f..a40b58432 100644 --- a/plugin/clouddns/setup.go +++ b/plugin/clouddns/setup.go @@ -4,13 +4,13 @@ import ( "context" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/fall" clog "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/plugin/pkg/upstream" - "github.com/caddyserver/caddy" gcp "google.golang.org/api/dns/v1" "google.golang.org/api/option" ) diff --git a/plugin/clouddns/setup_test.go b/plugin/clouddns/setup_test.go index 6d2997298..ae2262e7a 100644 --- a/plugin/clouddns/setup_test.go +++ b/plugin/clouddns/setup_test.go @@ -4,7 +4,8 @@ import ( "context" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" + "google.golang.org/api/option" ) diff --git a/plugin/debug/debug.go b/plugin/debug/debug.go index 91cc6fcf0..7fb6861fe 100644 --- a/plugin/debug/debug.go +++ b/plugin/debug/debug.go @@ -1,10 +1,9 @@ package debug import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("debug", setup) } diff --git a/plugin/debug/debug_test.go b/plugin/debug/debug_test.go index 8e1dcd9cd..71ebf37c1 100644 --- a/plugin/debug/debug_test.go +++ b/plugin/debug/debug_test.go @@ -3,9 +3,8 @@ package debug import ( "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - - "github.com/caddyserver/caddy" ) func TestDebug(t *testing.T) { diff --git a/plugin/deprecated/setup.go b/plugin/deprecated/setup.go index 782f36f04..64caa0cec 100644 --- a/plugin/deprecated/setup.go +++ b/plugin/deprecated/setup.go @@ -1,6 +1,6 @@ // Package deprecated is used when we deprecated plugin. In plugin.cfg just go from // -// startup:github.com/caddyserver/caddy/startupshutdown +// startup:github.com/coredns/caddy/startupshutdown // // To: // @@ -14,9 +14,8 @@ package deprecated import ( "errors" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) // removed has the names of the plugins that need to error on startup. diff --git a/plugin/dns64/setup.go b/plugin/dns64/setup.go index 44bc01a2d..0c53fab4b 100644 --- a/plugin/dns64/setup.go +++ b/plugin/dns64/setup.go @@ -3,12 +3,11 @@ package dns64 import ( "net" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/plugin/pkg/upstream" - - "github.com/caddyserver/caddy" ) const pluginName = "dns64" diff --git a/plugin/dns64/setup_test.go b/plugin/dns64/setup_test.go index 13a18a0e1..3b4a4fe0e 100644 --- a/plugin/dns64/setup_test.go +++ b/plugin/dns64/setup_test.go @@ -3,7 +3,7 @@ package dns64 import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupDns64(t *testing.T) { diff --git a/plugin/dnssec/setup.go b/plugin/dnssec/setup.go index 25ef91a67..d3056dc19 100644 --- a/plugin/dnssec/setup.go +++ b/plugin/dnssec/setup.go @@ -6,12 +6,11 @@ import ( "strconv" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/cache" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("dnssec") diff --git a/plugin/dnssec/setup_test.go b/plugin/dnssec/setup_test.go index ab58cc0a4..7132d04eb 100644 --- a/plugin/dnssec/setup_test.go +++ b/plugin/dnssec/setup_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupDnssec(t *testing.T) { diff --git a/plugin/dnstap/setup.go b/plugin/dnstap/setup.go index ee481fe11..e1589798b 100644 --- a/plugin/dnstap/setup.go +++ b/plugin/dnstap/setup.go @@ -3,12 +3,11 @@ package dnstap import ( "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/dnstap/dnstapio" "github.com/coredns/coredns/plugin/pkg/parse" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("dnstap", wrapSetup) } diff --git a/plugin/dnstap/setup_test.go b/plugin/dnstap/setup_test.go index 5ed8c3b6a..8fad9cd39 100644 --- a/plugin/dnstap/setup_test.go +++ b/plugin/dnstap/setup_test.go @@ -3,7 +3,7 @@ package dnstap import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestConfig(t *testing.T) { diff --git a/plugin/erratic/setup.go b/plugin/erratic/setup.go index 1cc6e048d..524473c4e 100644 --- a/plugin/erratic/setup.go +++ b/plugin/erratic/setup.go @@ -5,10 +5,9 @@ import ( "strconv" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("erratic", setup) } diff --git a/plugin/erratic/setup_test.go b/plugin/erratic/setup_test.go index 54e98cf82..9d2ff51b9 100644 --- a/plugin/erratic/setup_test.go +++ b/plugin/erratic/setup_test.go @@ -3,7 +3,7 @@ package erratic import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/errors/setup.go b/plugin/errors/setup.go index 283f3dd15..ef279dadf 100644 --- a/plugin/errors/setup.go +++ b/plugin/errors/setup.go @@ -4,10 +4,9 @@ import ( "regexp" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("errors", setup) } diff --git a/plugin/errors/setup_test.go b/plugin/errors/setup_test.go index 54ee3512a..c61cf54c4 100644 --- a/plugin/errors/setup_test.go +++ b/plugin/errors/setup_test.go @@ -3,7 +3,7 @@ package errors import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestErrorsParse(t *testing.T) { diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go index a95549f32..622e97b91 100644 --- a/plugin/etcd/setup.go +++ b/plugin/etcd/setup.go @@ -3,12 +3,12 @@ package etcd import ( "crypto/tls" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" mwtls "github.com/coredns/coredns/plugin/pkg/tls" "github.com/coredns/coredns/plugin/pkg/upstream" - "github.com/caddyserver/caddy" etcdcv3 "go.etcd.io/etcd/clientv3" ) diff --git a/plugin/etcd/setup_test.go b/plugin/etcd/setup_test.go index 8a84d0fd1..219563664 100644 --- a/plugin/etcd/setup_test.go +++ b/plugin/etcd/setup_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupEtcd(t *testing.T) { diff --git a/plugin/file/setup.go b/plugin/file/setup.go index 44ecf2ca1..c1dc853d6 100644 --- a/plugin/file/setup.go +++ b/plugin/file/setup.go @@ -5,12 +5,11 @@ import ( "path/filepath" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/upstream" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("file", setup) } diff --git a/plugin/file/setup_test.go b/plugin/file/setup_test.go index 6a1d5e790..1d3b8dc88 100644 --- a/plugin/file/setup_test.go +++ b/plugin/file/setup_test.go @@ -4,9 +4,8 @@ import ( "testing" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/test" - - "github.com/caddyserver/caddy" ) func TestFileParse(t *testing.T) { diff --git a/plugin/forward/proxy_test.go b/plugin/forward/proxy_test.go index b6b755a66..dc1f5fb18 100644 --- a/plugin/forward/proxy_test.go +++ b/plugin/forward/proxy_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/dnstest" "github.com/coredns/coredns/plugin/pkg/transport" "github.com/coredns/coredns/plugin/test" "github.com/coredns/coredns/request" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/forward/setup.go b/plugin/forward/setup.go index 0c2455dfe..125d53e4c 100644 --- a/plugin/forward/setup.go +++ b/plugin/forward/setup.go @@ -7,13 +7,12 @@ import ( "strconv" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/parse" pkgtls "github.com/coredns/coredns/plugin/pkg/tls" "github.com/coredns/coredns/plugin/pkg/transport" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("forward", setup) } diff --git a/plugin/forward/setup_policy_test.go b/plugin/forward/setup_policy_test.go index 0163e61c0..2786f9a7a 100644 --- a/plugin/forward/setup_policy_test.go +++ b/plugin/forward/setup_policy_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupPolicy(t *testing.T) { diff --git a/plugin/forward/setup_test.go b/plugin/forward/setup_test.go index 6864136e4..ac62f2fa8 100644 --- a/plugin/forward/setup_test.go +++ b/plugin/forward/setup_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/grpc/setup.go b/plugin/grpc/setup.go index 7deb731b4..6c29292d3 100644 --- a/plugin/grpc/setup.go +++ b/plugin/grpc/setup.go @@ -4,12 +4,11 @@ import ( "crypto/tls" "fmt" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/parse" pkgtls "github.com/coredns/coredns/plugin/pkg/tls" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("grpc", setup) } diff --git a/plugin/grpc/setup_policy_test.go b/plugin/grpc/setup_policy_test.go index 85f20e95c..c13339d96 100644 --- a/plugin/grpc/setup_policy_test.go +++ b/plugin/grpc/setup_policy_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupPolicy(t *testing.T) { diff --git a/plugin/grpc/setup_test.go b/plugin/grpc/setup_test.go index 6a6646292..48ed94af6 100644 --- a/plugin/grpc/setup_test.go +++ b/plugin/grpc/setup_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/health/setup.go b/plugin/health/setup.go index 630b11647..9cabeb7e6 100644 --- a/plugin/health/setup.go +++ b/plugin/health/setup.go @@ -5,9 +5,8 @@ import ( "net" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("health", setup) } diff --git a/plugin/health/setup_test.go b/plugin/health/setup_test.go index f570d803d..7bb213259 100644 --- a/plugin/health/setup_test.go +++ b/plugin/health/setup_test.go @@ -3,7 +3,7 @@ package health import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupHealth(t *testing.T) { diff --git a/plugin/hosts/setup.go b/plugin/hosts/setup.go index a66795faf..f79b2446c 100644 --- a/plugin/hosts/setup.go +++ b/plugin/hosts/setup.go @@ -7,11 +7,10 @@ import ( "strings" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("hosts") diff --git a/plugin/hosts/setup_test.go b/plugin/hosts/setup_test.go index fd8a8060e..cf943a2c0 100644 --- a/plugin/hosts/setup_test.go +++ b/plugin/hosts/setup_test.go @@ -3,9 +3,8 @@ package hosts import ( "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/fall" - - "github.com/caddyserver/caddy" ) func TestHostsParse(t *testing.T) { diff --git a/plugin/k8s_external/setup.go b/plugin/k8s_external/setup.go index 651ed1ba8..8783507bd 100644 --- a/plugin/k8s_external/setup.go +++ b/plugin/k8s_external/setup.go @@ -3,11 +3,10 @@ package external import ( "strconv" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/upstream" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("k8s_external", setup) } diff --git a/plugin/k8s_external/setup_test.go b/plugin/k8s_external/setup_test.go index 82ee243ee..fde5ca637 100644 --- a/plugin/k8s_external/setup_test.go +++ b/plugin/k8s_external/setup_test.go @@ -3,7 +3,7 @@ package external import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/kubernetes/local.go b/plugin/kubernetes/local.go index fccbb2a8a..a754f2125 100644 --- a/plugin/kubernetes/local.go +++ b/plugin/kubernetes/local.go @@ -3,7 +3,7 @@ package kubernetes import ( "net" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" ) diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index 395bef333..a412f57f5 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -9,6 +9,7 @@ import ( "strings" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnsutil" @@ -16,7 +17,6 @@ import ( "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/upstream" - "github.com/caddyserver/caddy" "github.com/miekg/dns" meta "k8s.io/apimachinery/pkg/apis/meta/v1" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s diff --git a/plugin/kubernetes/setup_reverse_test.go b/plugin/kubernetes/setup_reverse_test.go index 50fefb062..e9b878319 100644 --- a/plugin/kubernetes/setup_reverse_test.go +++ b/plugin/kubernetes/setup_reverse_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseReverseZone(t *testing.T) { diff --git a/plugin/kubernetes/setup_test.go b/plugin/kubernetes/setup_test.go index 634401d9d..14781a862 100644 --- a/plugin/kubernetes/setup_test.go +++ b/plugin/kubernetes/setup_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/fall" - "github.com/caddyserver/caddy" meta "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/plugin/kubernetes/setup_transfer_test.go b/plugin/kubernetes/setup_transfer_test.go index fce4e10c5..57d665821 100644 --- a/plugin/kubernetes/setup_transfer_test.go +++ b/plugin/kubernetes/setup_transfer_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseTransfer(t *testing.T) { diff --git a/plugin/kubernetes/setup_ttl_test.go b/plugin/kubernetes/setup_ttl_test.go index c4a001302..16b9b4a70 100644 --- a/plugin/kubernetes/setup_ttl_test.go +++ b/plugin/kubernetes/setup_ttl_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseTTL(t *testing.T) { diff --git a/plugin/loadbalance/setup.go b/plugin/loadbalance/setup.go index 4c5a6bfd8..f8f2b3683 100644 --- a/plugin/loadbalance/setup.go +++ b/plugin/loadbalance/setup.go @@ -3,11 +3,10 @@ package loadbalance import ( "fmt" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("loadbalance") diff --git a/plugin/loadbalance/setup_test.go b/plugin/loadbalance/setup_test.go index f33dcd337..38cea1478 100644 --- a/plugin/loadbalance/setup_test.go +++ b/plugin/loadbalance/setup_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/log/setup.go b/plugin/log/setup.go index f9441bf92..dc7db52cf 100644 --- a/plugin/log/setup.go +++ b/plugin/log/setup.go @@ -3,12 +3,12 @@ package log import ( "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/replacer" "github.com/coredns/coredns/plugin/pkg/response" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/log/setup_test.go b/plugin/log/setup_test.go index aac1ebf40..efffff0e1 100644 --- a/plugin/log/setup_test.go +++ b/plugin/log/setup_test.go @@ -4,9 +4,8 @@ import ( "reflect" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/response" - - "github.com/caddyserver/caddy" ) func TestLogParse(t *testing.T) { diff --git a/plugin/loop/setup.go b/plugin/loop/setup.go index 3cf4861ac..68af97e5e 100644 --- a/plugin/loop/setup.go +++ b/plugin/loop/setup.go @@ -6,11 +6,10 @@ import ( "strconv" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnsutil" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("loop", setup) } diff --git a/plugin/loop/setup_test.go b/plugin/loop/setup_test.go index 5a7386998..6b80b9b5b 100644 --- a/plugin/loop/setup_test.go +++ b/plugin/loop/setup_test.go @@ -3,7 +3,7 @@ package loop import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/metadata/setup.go b/plugin/metadata/setup.go index 734ea678e..7a0985a2d 100644 --- a/plugin/metadata/setup.go +++ b/plugin/metadata/setup.go @@ -1,10 +1,9 @@ package metadata import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("metadata", setup) } diff --git a/plugin/metadata/setup_test.go b/plugin/metadata/setup_test.go index 500d67d19..ed552f70d 100644 --- a/plugin/metadata/setup_test.go +++ b/plugin/metadata/setup_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/metrics/setup.go b/plugin/metrics/setup.go index 719362609..3858fb519 100644 --- a/plugin/metrics/setup.go +++ b/plugin/metrics/setup.go @@ -4,14 +4,13 @@ import ( "net" "runtime" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/coremain" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/metrics/vars" clog "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/plugin/pkg/uniq" - - "github.com/caddyserver/caddy" ) var ( diff --git a/plugin/metrics/setup_test.go b/plugin/metrics/setup_test.go index a0c1fe8d1..3a584a6cb 100644 --- a/plugin/metrics/setup_test.go +++ b/plugin/metrics/setup_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestPrometheusParse(t *testing.T) { diff --git a/plugin/nsid/setup.go b/plugin/nsid/setup.go index 3fa0edd85..07c649316 100644 --- a/plugin/nsid/setup.go +++ b/plugin/nsid/setup.go @@ -4,10 +4,9 @@ import ( "os" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("nsid", setup) } diff --git a/plugin/nsid/setup_test.go b/plugin/nsid/setup_test.go index bf5998815..15d40425f 100644 --- a/plugin/nsid/setup_test.go +++ b/plugin/nsid/setup_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupNsid(t *testing.T) { diff --git a/plugin/pkg/parse/parse.go b/plugin/pkg/parse/parse.go index 232e163fd..356d6c21c 100644 --- a/plugin/pkg/parse/parse.go +++ b/plugin/pkg/parse/parse.go @@ -4,9 +4,8 @@ package parse import ( "fmt" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/transport" - - "github.com/caddyserver/caddy" ) // Transfer parses transfer statements: 'transfer [to|from] [address...]'. diff --git a/plugin/pkg/parse/parse_test.go b/plugin/pkg/parse/parse_test.go index a9f947a7d..e0f817f49 100644 --- a/plugin/pkg/parse/parse_test.go +++ b/plugin/pkg/parse/parse_test.go @@ -3,7 +3,7 @@ package parse import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestTransfer(t *testing.T) { diff --git a/plugin/pprof/setup.go b/plugin/pprof/setup.go index a9b93673c..6eba18a2a 100644 --- a/plugin/pprof/setup.go +++ b/plugin/pprof/setup.go @@ -4,10 +4,9 @@ import ( "net" "strconv" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("pprof") diff --git a/plugin/pprof/setup_test.go b/plugin/pprof/setup_test.go index 9c9fafec4..500a400d0 100644 --- a/plugin/pprof/setup_test.go +++ b/plugin/pprof/setup_test.go @@ -3,7 +3,7 @@ package pprof import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestPProf(t *testing.T) { diff --git a/plugin/ready/setup.go b/plugin/ready/setup.go index 3c0e2ce43..80f09d516 100644 --- a/plugin/ready/setup.go +++ b/plugin/ready/setup.go @@ -3,10 +3,9 @@ package ready import ( "net" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("ready", setup) } diff --git a/plugin/ready/setup_test.go b/plugin/ready/setup_test.go index 7016e79d1..1dd0d4a86 100644 --- a/plugin/ready/setup_test.go +++ b/plugin/ready/setup_test.go @@ -3,7 +3,7 @@ package ready import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupReady(t *testing.T) { diff --git a/plugin/register.go b/plugin/register.go index 2d74b2622..16090ffa6 100644 --- a/plugin/register.go +++ b/plugin/register.go @@ -1,6 +1,6 @@ package plugin -import "github.com/caddyserver/caddy" +import "github.com/coredns/caddy" // Register registers your plugin with CoreDNS and allows it to be called when the server is running. func Register(name string, action caddy.SetupFunc) { diff --git a/plugin/reload/reload.go b/plugin/reload/reload.go index 364a2b6f0..e3e05fb37 100644 --- a/plugin/reload/reload.go +++ b/plugin/reload/reload.go @@ -9,8 +9,9 @@ import ( "sync" "time" - "github.com/caddyserver/caddy" - "github.com/caddyserver/caddy/caddyfile" + "github.com/coredns/caddy" + "github.com/coredns/caddy/caddyfile" + "github.com/prometheus/client_golang/prometheus" ) diff --git a/plugin/reload/setup.go b/plugin/reload/setup.go index 557349a9d..6df323431 100644 --- a/plugin/reload/setup.go +++ b/plugin/reload/setup.go @@ -6,10 +6,9 @@ import ( "sync" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("reload") diff --git a/plugin/reload/setup_test.go b/plugin/reload/setup_test.go index b7f3b5cca..5450fae57 100644 --- a/plugin/reload/setup_test.go +++ b/plugin/reload/setup_test.go @@ -3,7 +3,7 @@ package reload import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetupReload(t *testing.T) { diff --git a/plugin/rewrite/fuzz.go b/plugin/rewrite/fuzz.go index 757ffab45..8149d1c09 100644 --- a/plugin/rewrite/fuzz.go +++ b/plugin/rewrite/fuzz.go @@ -3,9 +3,8 @@ package rewrite import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/fuzz" - - "github.com/caddyserver/caddy" ) // Fuzz fuzzes rewrite. diff --git a/plugin/rewrite/setup.go b/plugin/rewrite/setup.go index 8c2890c62..36f31dcf2 100644 --- a/plugin/rewrite/setup.go +++ b/plugin/rewrite/setup.go @@ -1,10 +1,9 @@ package rewrite import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("rewrite", setup) } diff --git a/plugin/rewrite/setup_test.go b/plugin/rewrite/setup_test.go index ece0a7f06..dcad03961 100644 --- a/plugin/rewrite/setup_test.go +++ b/plugin/rewrite/setup_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestParse(t *testing.T) { diff --git a/plugin/root/root.go b/plugin/root/root.go index 66177a6bd..b8bdf94b7 100644 --- a/plugin/root/root.go +++ b/plugin/root/root.go @@ -3,11 +3,10 @@ package root import ( "os" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" clog "github.com/coredns/coredns/plugin/pkg/log" - - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("root") diff --git a/plugin/root/root_test.go b/plugin/root/root_test.go index 3f2a786c0..dde1ae6b7 100644 --- a/plugin/root/root_test.go +++ b/plugin/root/root_test.go @@ -8,9 +8,8 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - - "github.com/caddyserver/caddy" ) func TestRoot(t *testing.T) { diff --git a/plugin/route53/setup.go b/plugin/route53/setup.go index 1d1eaee95..2f6ee8fc1 100644 --- a/plugin/route53/setup.go +++ b/plugin/route53/setup.go @@ -7,6 +7,7 @@ import ( "strings" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/fall" @@ -19,7 +20,6 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/route53" "github.com/aws/aws-sdk-go/service/route53/route53iface" - "github.com/caddyserver/caddy" ) var log = clog.NewWithPlugin("route53") diff --git a/plugin/route53/setup_test.go b/plugin/route53/setup_test.go index cb73d8fef..e521091f6 100644 --- a/plugin/route53/setup_test.go +++ b/plugin/route53/setup_test.go @@ -3,9 +3,10 @@ package route53 import ( "testing" + "github.com/coredns/caddy" + "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/service/route53/route53iface" - "github.com/caddyserver/caddy" ) func TestSetupRoute53(t *testing.T) { diff --git a/plugin/secondary/setup.go b/plugin/secondary/setup.go index 410bc0976..108415290 100644 --- a/plugin/secondary/setup.go +++ b/plugin/secondary/setup.go @@ -1,13 +1,12 @@ package secondary import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/file" "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/upstream" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("secondary", setup) } diff --git a/plugin/secondary/setup_test.go b/plugin/secondary/setup_test.go index 7fc36f679..bd60ba69c 100644 --- a/plugin/secondary/setup_test.go +++ b/plugin/secondary/setup_test.go @@ -3,7 +3,7 @@ package secondary import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSecondaryParse(t *testing.T) { diff --git a/plugin/sign/keys.go b/plugin/sign/keys.go index 03065e8b4..5abefdd59 100644 --- a/plugin/sign/keys.go +++ b/plugin/sign/keys.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - "github.com/caddyserver/caddy" "github.com/miekg/dns" "golang.org/x/crypto/ed25519" ) diff --git a/plugin/sign/setup.go b/plugin/sign/setup.go index c830eb930..50c297051 100644 --- a/plugin/sign/setup.go +++ b/plugin/sign/setup.go @@ -6,10 +6,9 @@ import ( "path/filepath" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("sign", setup) } diff --git a/plugin/sign/setup_test.go b/plugin/sign/setup_test.go index ce25720a0..93d779a26 100644 --- a/plugin/sign/setup_test.go +++ b/plugin/sign/setup_test.go @@ -3,7 +3,7 @@ package sign import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestParse(t *testing.T) { diff --git a/plugin/sign/signer_test.go b/plugin/sign/signer_test.go index bb364728e..869e99d96 100644 --- a/plugin/sign/signer_test.go +++ b/plugin/sign/signer_test.go @@ -7,7 +7,8 @@ import ( "testing" "time" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" + "github.com/miekg/dns" ) diff --git a/plugin/template/metrics.go b/plugin/template/metrics.go index db930dd77..b18cded78 100644 --- a/plugin/template/metrics.go +++ b/plugin/template/metrics.go @@ -2,6 +2,7 @@ package template import ( "github.com/coredns/coredns/plugin" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/plugin/template/setup.go b/plugin/template/setup.go index d79dcbb86..978f1ffc2 100644 --- a/plugin/template/setup.go +++ b/plugin/template/setup.go @@ -4,11 +4,11 @@ import ( "regexp" gotmpl "text/template" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/upstream" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/template/setup_test.go b/plugin/template/setup_test.go index adae1cb72..85261463e 100644 --- a/plugin/template/setup_test.go +++ b/plugin/template/setup_test.go @@ -3,7 +3,7 @@ package template import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { diff --git a/plugin/template/template_test.go b/plugin/template/template_test.go index d26012298..8ceb83697 100644 --- a/plugin/template/template_test.go +++ b/plugin/template/template_test.go @@ -7,12 +7,12 @@ import ( "testing" gotmpl "text/template" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/metadata" "github.com/coredns/coredns/plugin/pkg/dnstest" "github.com/coredns/coredns/plugin/pkg/fall" "github.com/coredns/coredns/plugin/test" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/plugin/tls/tls.go b/plugin/tls/tls.go index bfde8cb2a..bb6504352 100644 --- a/plugin/tls/tls.go +++ b/plugin/tls/tls.go @@ -3,11 +3,10 @@ package tls import ( ctls "crypto/tls" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/tls" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("tls", setup) } diff --git a/plugin/tls/tls_test.go b/plugin/tls/tls_test.go index f1ff8ab3e..5aef82f34 100644 --- a/plugin/tls/tls_test.go +++ b/plugin/tls/tls_test.go @@ -5,9 +5,8 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - - "github.com/caddyserver/caddy" ) func TestTLS(t *testing.T) { diff --git a/plugin/trace/setup.go b/plugin/trace/setup.go index 64931933a..2ef73a0e4 100644 --- a/plugin/trace/setup.go +++ b/plugin/trace/setup.go @@ -5,10 +5,9 @@ import ( "strconv" "strings" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("trace", setup) } diff --git a/plugin/trace/setup_test.go b/plugin/trace/setup_test.go index 5c8d3248f..34b0adb29 100644 --- a/plugin/trace/setup_test.go +++ b/plugin/trace/setup_test.go @@ -3,7 +3,7 @@ package trace import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestTraceParse(t *testing.T) { diff --git a/plugin/trace/trace_test.go b/plugin/trace/trace_test.go index 7ea49a255..9b1105129 100644 --- a/plugin/trace/trace_test.go +++ b/plugin/trace/trace_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/dnstest" "github.com/coredns/coredns/plugin/pkg/rcode" "github.com/coredns/coredns/plugin/test" "github.com/coredns/coredns/request" - "github.com/caddyserver/caddy" "github.com/miekg/dns" "github.com/opentracing/opentracing-go/mocktracer" ) diff --git a/plugin/transfer/setup.go b/plugin/transfer/setup.go index f194bd2ec..528e53847 100644 --- a/plugin/transfer/setup.go +++ b/plugin/transfer/setup.go @@ -1,12 +1,11 @@ package transfer import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" parsepkg "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/transport" - - "github.com/caddyserver/caddy" ) func init() { diff --git a/plugin/transfer/setup_test.go b/plugin/transfer/setup_test.go index 09d8657e9..dfbbc3950 100644 --- a/plugin/transfer/setup_test.go +++ b/plugin/transfer/setup_test.go @@ -3,7 +3,7 @@ package transfer import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func newTestControllerWithZones(input string, zones []string) *caddy.Controller { diff --git a/plugin/whoami/setup.go b/plugin/whoami/setup.go index 6c19b72d6..1602740ea 100644 --- a/plugin/whoami/setup.go +++ b/plugin/whoami/setup.go @@ -1,10 +1,9 @@ package whoami import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("whoami", setup) } diff --git a/plugin/whoami/setup_test.go b/plugin/whoami/setup_test.go index f66b007e0..18a5b9402 100644 --- a/plugin/whoami/setup_test.go +++ b/plugin/whoami/setup_test.go @@ -3,7 +3,7 @@ package whoami import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { |