TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update Caddy to 1.0.1, and update import path (#2961)

Browse source 
* Update Caddy to 1.0.1, and update import path

This fix updates caddy to 1.0.1 and also
updates the import path to github.com/caddyserver/caddy

This fix fixes 2959

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Also update plugin.cfg

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update and bump zplugin.go

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2019-07-03 09:04:47 +08:00 • committed by GitHub
parent 22c6e3e179
commit f8bba51f84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 114 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/dnsserver/config.go
View file

@ -6,7 +6,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// Config configuration for a single server.

4
core/dnsserver/register.go
View file

@ -12,8 +12,8 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/coredns/coredns/plugin/pkg/transport"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyfile"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
const serverType = "dns"

2
core/plugin/zplugin.go
View file

@ -4,6 +4,7 @@ package plugin
import (
// Include all plugins.
_ "github.com/caddyserver/caddy/onevent"
_ "github.com/coredns/coredns/plugin/any"
_ "github.com/coredns/coredns/plugin/auto"
_ "github.com/coredns/coredns/plugin/autopath"
@ -42,5 +43,4 @@ import (
_ "github.com/coredns/coredns/plugin/tls"
_ "github.com/coredns/coredns/plugin/trace"
_ "github.com/coredns/coredns/plugin/whoami"
_ "github.com/mholt/caddy/onevent"
)

2
coremain/run.go
View file

@ -15,7 +15,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
go.mod
View file

@ -7,6 +7,7 @@ require (
github.com/Shopify/sarama v1.21.0 // indirect
github.com/apache/thrift v0.12.0 // indirect
github.com/aws/aws-sdk-go v1.20.5
github.com/caddyserver/caddy v1.0.1
github.com/coreos/bbolt v1.3.2 // indirect
github.com/coreos/etcd v3.3.13+incompatible
github.com/coreos/go-semver v0.2.0 // indirect
@ -31,7 +32,6 @@ require (
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/mholt/caddy v1.0.0
github.com/miekg/dns v1.1.14
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
github.com/opentracing/opentracing-go v1.1.0

11
go.sum
View file

@ -20,6 +20,9 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
github.com/caddyserver/caddy v1.0.1 h1:oor6ep+8NoJOabpFXhvjqjfeldtw1XSzfISVrbfqTKo=
github.com/caddyserver/caddy v1.0.1/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@ -57,6 +60,7 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-acme/lego v2.5.0+incompatible h1:5fNN9yRQfv8ymH3DSsxla+4aYeQt2IgfZqHKVnK8f0s=
github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@ -123,6 +127,7 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
@ -142,9 +147,8 @@ github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cce
github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mholt/caddy v1.0.0 h1:KI6RPGih2GFzWRPG8s9clKK28Ns4ZlVMKR/v7mxq6+c=
github.com/mholt/caddy v1.0.0/go.mod h1:PzUpQ3yGCTuEuy0KSxEeB4TZOi3zBZ8BR/zY0RBP414=
github.com/mholt/certmagic v0.5.0/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 h1:xKE9kZ5C8gelJC3+BNM6LJs1x21rivK7yxfTZMAuY2s=
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
github.com/miekg/dns v1.1.14 h1:wkQWn9wIp4mZbwW8XV6Km6owkvRPbOiV004ZM2CkGvA=
github.com/miekg/dns v1.1.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@ -324,6 +328,7 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

2
plugin.cfg
View file

@ -57,4 +57,4 @@ forward:forward
grpc:grpc
erratic:erratic
whoami:whoami
on:github.com/mholt/caddy/onevent
on:github.com/caddyserver/caddy/onevent

2
plugin/any/setup.go
View file

@ -4,7 +4,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/auto/setup.go
View file

@ -13,7 +13,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("auto")

2
plugin/auto/setup_test.go
View file

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestAutoParse(t *testing.T) {

2
plugin/autopath/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/metrics"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
plugin/autopath/setup_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/plugin/test"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupAutoPath(t *testing.T) {

2
plugin/bind/bind.go
View file

@ -1,7 +1,7 @@
// Package bind allows binding to a specific interface instead of bind to all of them.
package bind
import "github.com/mholt/caddy"
import "github.com/caddyserver/caddy"
func init() {
caddy.RegisterPlugin("bind", caddy.Plugin{

2
plugin/bind/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func setup(c *caddy.Controller) error {

2
plugin/bind/setup_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/cache/setup.go vendored
View file

@ -11,7 +11,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/cache"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("cache")

2
plugin/cache/setup_test.go vendored
View file

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/cancel/cancel.go
View file

@ -9,7 +9,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
plugin/cancel/setup_test.go
View file

@ -3,7 +3,7 @@ package cancel
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/chaos/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/chaos/setup_test.go
View file

@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupChaos(t *testing.T) {

2
plugin/debug/debug.go
View file

@ -4,7 +4,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/debug/debug_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestDebug(t *testing.T) {

4
plugin/deprecated/setup.go
View file

@ -1,6 +1,6 @@
// Package deprecated is used when we deprecated plugin. In plugin.cfg just go from
//
// startup:github.com/mholt/caddy/startupshutdown
// startup:github.com/caddyserver/caddy/startupshutdown
//
// To:
//
@ -16,7 +16,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// removed has the names of the plugins that need to error on startup.

2
plugin/dnssec/setup.go
View file

@ -12,7 +12,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/cache"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("dnssec")

2
plugin/dnssec/setup_test.go
View file

@ -6,7 +6,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupDnssec(t *testing.T) {

4
plugin/dnstap/setup.go
View file

@ -9,8 +9,8 @@ import (
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyfile"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
var log = clog.NewWithPlugin("dnstap")

2
plugin/dnstap/setup_test.go
View file

@ -3,7 +3,7 @@ package dnstap
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestConfig(t *testing.T) {

2
plugin/erratic/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/erratic/setup_test.go
View file

@ -3,7 +3,7 @@ package erratic
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/errors/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/errors/setup_test.go
View file

@ -3,7 +3,7 @@ package errors
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestErrorsParse(t *testing.T) {

2
plugin/etcd/setup.go
View file

@ -10,7 +10,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/upstream"
etcdcv3 "github.com/coreos/etcd/clientv3"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("etcd")

2
plugin/etcd/setup_test.go
View file

@ -6,7 +6,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupEtcd(t *testing.T) {

2
plugin/federation/setup.go
View file

@ -9,7 +9,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/miekg/dns"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/federation/setup_test.go
View file

@ -3,7 +3,7 @@ package federation
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/file/setup.go
View file

@ -10,7 +10,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/file/setup_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/coredns/coredns/plugin/test"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestFileParse(t *testing.T) {

2
plugin/forward/proxy_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

4
plugin/forward/setup.go
View file

@ -12,8 +12,8 @@ import (
pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
"github.com/coredns/coredns/plugin/pkg/transport"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyfile"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
func init() {

2
plugin/forward/setup_policy_test.go
View file

@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupPolicy(t *testing.T) {

2
plugin/forward/setup_test.go
View file

@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

4
plugin/grpc/setup.go
View file

@ -10,8 +10,8 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyfile"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
func init() {

2
plugin/grpc/setup_policy_test.go
View file

@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupPolicy(t *testing.T) {

2
plugin/grpc/setup_test.go
View file

@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/health/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/metrics"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/health/setup_test.go
View file

@ -3,7 +3,7 @@ package health
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupHealth(t *testing.T) {

2
plugin/hosts/setup.go
View file

@ -11,7 +11,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("hosts")

2
plugin/hosts/setup_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/fall"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestHostsParse(t *testing.T) {

2
plugin/k8s_external/setup.go
View file

@ -6,7 +6,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/k8s_external/setup_test.go
View file

@ -3,7 +3,7 @@ package external
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/kubernetes/setup.go
View file

@ -16,7 +16,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"

2
plugin/kubernetes/setup_reverse_test.go
View file

@ -3,7 +3,7 @@ package kubernetes
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestKubernetesParseReverseZone(t *testing.T) {

2
plugin/kubernetes/setup_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/fall"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
plugin/kubernetes/setup_transfer_test.go
View file

@ -3,7 +3,7 @@ package kubernetes
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestKubernetesParseTransfer(t *testing.T) {

2
plugin/kubernetes/setup_ttl_test.go
View file

@ -3,7 +3,7 @@ package kubernetes
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestKubernetesParseTTL(t *testing.T) {

2
plugin/loadbalance/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("loadbalance")

2
plugin/loadbalance/setup_test.go
View file

@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/log/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/replacer"
"github.com/coredns/coredns/plugin/pkg/response"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
plugin/log/setup_test.go
View file

@ -6,7 +6,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/response"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestLogParse(t *testing.T) {

2
plugin/loop/setup.go
View file

@ -10,7 +10,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/pkg/dnsutil"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/loop/setup_test.go
View file

@ -3,7 +3,7 @@ package loop
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/metadata/setup.go
View file

@ -4,7 +4,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/metadata/setup_test.go
View file

@ -4,7 +4,7 @@ import (
"reflect"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/metrics/register.go
View file

@ -3,7 +3,7 @@ package metrics
import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/prometheus/client_golang/prometheus"
)

2
plugin/metrics/setup.go
View file

@ -11,7 +11,7 @@ import (
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/coredns/coredns/plugin/pkg/uniq"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var (

2
plugin/metrics/setup_test.go
View file

@ -3,7 +3,7 @@ package metrics
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestPrometheusParse(t *testing.T) {

2
plugin/nsid/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/nsid/setup_test.go
View file

@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupNsid(t *testing.T) {

2
plugin/pkg/parse/parse.go
View file

@ -6,7 +6,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/transport"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// Transfer parses transfer statements: 'transfer [to|from] [address...]'.

2
plugin/pkg/parse/parse_test.go
View file

@ -3,7 +3,7 @@ package parse
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestTransfer(t *testing.T) {

2
plugin/pprof/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("pprof")

2
plugin/pprof/setup_test.go
View file

@ -3,7 +3,7 @@ package pprof
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestPProf(t *testing.T) {

2
plugin/ready/setup.go
View file

@ -6,7 +6,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/ready/setup_test.go
View file

@ -3,7 +3,7 @@ package ready
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupReady(t *testing.T) {

2
plugin/reload/reload.go
View file

@ -5,7 +5,7 @@ import (
"sync"
"time"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// reload periodically checks if the Corefile has changed, and reloads if so

2
plugin/reload/setup.go
View file

@ -9,7 +9,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("reload")

2
plugin/reload/setup_test.go
View file

@ -3,7 +3,7 @@ package reload
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupReload(t *testing.T) {

2
plugin/rewrite/fuzz.go
View file

@ -5,7 +5,7 @@ package rewrite
import (
"github.com/coredns/coredns/plugin/pkg/fuzz"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// Fuzz fuzzes rewrite.

2
plugin/rewrite/setup.go
View file

@ -5,7 +5,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("rewrite")

2
plugin/rewrite/setup_test.go
View file

@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestParse(t *testing.T) {

2
plugin/root/root.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("root")

2
plugin/root/root_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestRoot(t *testing.T) {

2
plugin/route53/setup.go
View file

@ -15,7 +15,7 @@ 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/mholt/caddy"
"github.com/caddyserver/caddy"
)
var log = clog.NewWithPlugin("route53")

2
plugin/route53/setup_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/service/route53/route53iface"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetupRoute53(t *testing.T) {

2
plugin/secondary/setup.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/secondary/setup_test.go
View file

@ -3,7 +3,7 @@ package secondary
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSecondaryParse(t *testing.T) {

2
plugin/template/metrics.go
View file

@ -4,7 +4,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/metrics"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/prometheus/client_golang/prometheus"
)

2
plugin/template/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
plugin/template/setup_test.go
View file

@ -3,7 +3,7 @@ package template
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
plugin/template/template_test.go
View file

@ -11,7 +11,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/fall"
"github.com/coredns/coredns/plugin/test"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
plugin/tls/tls.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/pkg/tls"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/tls/tls_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestTLS(t *testing.T) {

2
plugin/trace/setup.go
View file

@ -8,7 +8,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/trace/setup_test.go
View file

@ -3,7 +3,7 @@ package trace
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestTraceParse(t *testing.T) {

2
plugin/trace/trace_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
"github.com/opentracing/opentracing-go/mocktracer"
)

2
plugin/whoami/setup.go
View file

@ -4,7 +4,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func init() {

2
plugin/whoami/setup_test.go
View file

@ -3,7 +3,7 @@ package whoami
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {

2
test/chaos_test.go
View file

@ -6,7 +6,7 @@ import (
// Plug in CoreDNS, needed for AppVersion and AppName in this test.
_ "github.com/coredns/coredns/coremain"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
"github.com/miekg/dns"
)

2
test/readme_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
// As we use the filesystem as-is, these files need to exist ON DISK for the readme test to work. This is especially

Some files were not shown because too many files have changed in this diff Show more