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

* 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
102 changed files with 114 additions and 109 deletions

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

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

View File

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

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

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

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{

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 {

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

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

View File

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

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

View File

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

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

View File

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

View File

@@ -1,4 +1,4 @@
package chaos
// Owners are all GitHub handlers of all maintainers.
var Owners = []string{"bradbeam", "chrisohaver", "dilyevsky", "ekleiner", "fastest963", "greenpau", "grobie", "inigohu", "isolus", "johnbelamaric", "miekg", "nchrisdk", "nitisht", "pmoroney", "rajansandeep", "rdrozhdzh", "rtreffer", "stp-ip", "superq", "varyoo", "yongtang"}
var Owners = []string{"bradbeam", "chrisohaver", "dilyevsky", "ekleiner", "fastest963", "greenpau", "grobie", "inigohu", "isolus", "johnbelamaric", "miekg", "nchrisdk", "nitisht", "pmoroney", "rajansandeep", "rdrozhdzh", "rtreffer", "stp-ip", "superq", "varyoo", "yongtang"}

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

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

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.

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

View File

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

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

View File

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

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

View File

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

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

View File

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

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

View File

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

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

View File

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

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

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

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

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

View File

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

View File

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

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

View File

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

View File

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

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

View File

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

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

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

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

View File

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

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"

View File

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

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

View File

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

View File

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

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

View File

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

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

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

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

View File

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

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

View File

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

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

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 (

View File

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

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

View File

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

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

View File

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

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

View File

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

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

View File

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

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

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

View File

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

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.

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

View File

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

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

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

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

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

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

View File

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

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

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

View File

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

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

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

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

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

View File

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

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

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

View File

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