For caddy v1 in our org (#4018)

* For caddy v1 in our org

This RP changes all imports for caddyserver/caddy to coredns/caddy. This
is the v1 code of caddy.

For the coredns/caddy repo the following changes have been made:

* anything not needed by us is deleted
* all `telemetry` stuff is deleted
* all its import paths are also changed to point to coredns/caddy
* the v1 branch has been moved to the master branch
* a v1.1.0 tag has been added to signal the latest release
Signed-off-by: Miek Gieben <miek@miek.nl>

* Fix imports
Signed-off-by: Miek Gieben <miek@miek.nl>

* Group coredns/caddy with out plugins
Signed-off-by: Miek Gieben <miek@miek.nl>

* remove this file
Signed-off-by: Miek Gieben <miek@miek.nl>

* Relax import ordering

github.com/coredns is now also a coredns dep, this makes
github.com/coredns/caddy fit more natural in the list.
Signed-off-by: Miek Gieben <miek@miek.nl>

* Fix final import
Signed-off-by: Miek Gieben <miek@miek.nl>

core/dnsserver/config.go

@@ -4,9 +4,8 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin"
-
-	"github.com/caddyserver/caddy"
 )
 
 // Config configuration for a single server.

core/dnsserver/register.go

@@ -7,13 +7,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coredns/caddy"
+	"github.com/coredns/caddy/caddyfile"
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/transport"
-
-	"github.com/caddyserver/caddy"
-	"github.com/caddyserver/caddy/caddyfile"
 )
 
 const serverType = "dns"

core/dnsserver/server.go

@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/metrics/vars"
 	"github.com/coredns/coredns/plugin/pkg/edns"
@@ -20,7 +21,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/transport"
 	"github.com/coredns/coredns/request"
 
-	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 )

core/dnsserver/server_grpc.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/pb"
 	"github.com/coredns/coredns/plugin/pkg/reuseport"
 	"github.com/coredns/coredns/plugin/pkg/transport"
 
-	"github.com/caddyserver/caddy"
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/miekg/dns"
 	"github.com/opentracing/opentracing-go"

core/dnsserver/server_https.go

@@ -9,13 +9,12 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/plugin/pkg/doh"
 	"github.com/coredns/coredns/plugin/pkg/response"
 	"github.com/coredns/coredns/plugin/pkg/reuseport"
 	"github.com/coredns/coredns/plugin/pkg/transport"
-
-	"github.com/caddyserver/caddy"
 )
 
 // ServerHTTPS represents an instance of a DNS-over-HTTPS server.

core/dnsserver/server_tls.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin/pkg/reuseport"
 	"github.com/coredns/coredns/plugin/pkg/transport"
 
-	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 

core/plugin/zplugin.go

@@ -4,7 +4,7 @@ package plugin
 
 import (
 	// Include all plugins.
-	_ "github.com/caddyserver/caddy/onevent"
+	_ "github.com/coredns/caddy/onevent"
 	_ "github.com/coredns/coredns/plugin/acl"
 	_ "github.com/coredns/coredns/plugin/any"
 	_ "github.com/coredns/coredns/plugin/auto"

coremain/run.go

@@ -10,9 +10,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/core/dnsserver"
-
-	"github.com/caddyserver/caddy"
 )
 
 func init() {

go.mod

@@ -6,13 +6,16 @@ require (
 	github.com/Azure/azure-sdk-for-go v40.6.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.11.6
 	github.com/Azure/go-autorest/autorest/azure/auth v0.5.2
+	github.com/Azure/go-autorest/autorest/to v0.2.0 // indirect
 	github.com/DataDog/datadog-go v3.5.0+incompatible // indirect
 	github.com/aws/aws-sdk-go v1.34.22
-	github.com/caddyserver/caddy v1.0.5
 	github.com/cenkalti/backoff/v4 v4.0.2
+	github.com/coredns/caddy v1.1.0
 	github.com/dnstap/golang-dnstap v0.2.1
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/farsightsec/golang-framestream v0.3.0
 	github.com/golang/protobuf v1.4.2
+	github.com/gorilla/websocket v1.4.0 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.9 // indirect

plugin.cfg

@@ -62,5 +62,5 @@ forward:forward
 grpc:grpc
 erratic:erratic
 whoami:whoami
-on:github.com/caddyserver/caddy/onevent
+on:github.com/coredns/caddy/onevent
 sign:sign

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"
 )
 

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"
 )

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) {

plugin/any/setup.go

 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) }

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")

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) {

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"
 )
 

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) {

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")

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) {

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 {

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) {

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) }

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) {

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")

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) {

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"
 )
 

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) {

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) }

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) {

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"
 )

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"
 )
 

plugin/debug/debug.go

 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) }

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) {

plugin/deprecated/setup.go

 // 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.

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"

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) {

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")

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) {

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) }

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) {

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) }

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) {

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) }

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) {

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"
 )
 

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) {

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) }

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) {

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"
 )
 

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) }

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) {

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) {

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) }

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) {

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) {

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) }

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) {

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")

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) {

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) }

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) {

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"
 )
 

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

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) {

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"
 )
 

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) {

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) {

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")

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) {

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"
 )
 

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) {

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) }

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) {

plugin/metadata/setup.go

 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) }

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) {

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 (

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) {

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) }

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) {

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...]'.

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) {

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")

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) {

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) }

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) {

plugin/register.go

 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) {

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"
 )
 

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")

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) {

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.

plugin/rewrite/setup.go

 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) }

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) {

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")

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) {

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")

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) {

plugin/secondary/setup.go

 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) }

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) {