diff options
| author |  Miek Gieben <miek@miek.nl>
| 2020-09-24 18:14:41 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-24 18:14:41 +0200 |
| commit | b003d06003750e26d1621c1d6167ce63ecd824d5 (patch) | |
| tree | 364892e67a24826063c2e3a5d308b1dadbeaa8b3 /plugin/trace | |
| parent | 24e668ecf085597faa3100f130a85c480a36c7cb (diff) | |
| download | coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.gz coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.zst coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.zip | |
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>
Diffstat (limited to 'plugin/trace')
| -rw-r--r-- | plugin/trace/setup.go | 3 | ||||
| -rw-r--r-- | plugin/trace/setup_test.go | 2 | ||||
| -rw-r--r-- | plugin/trace/trace_test.go | 2 |
3 files changed, 3 insertions, 4 deletions
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" ) |