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 /test | |
| 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 'test')
| -rw-r--r-- | test/chaos_test.go | 2 | ||||
| -rw-r--r-- | test/presubmit_test.go | 4 | ||||
| -rw-r--r-- | test/readme_test.go | 3 | ||||
| -rw-r--r-- | test/server.go | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/test/chaos_test.go b/test/chaos_test.go index 1246fdbba..5178e5fc3 100644 --- a/test/chaos_test.go +++ b/test/chaos_test.go @@ -4,9 +4,9 @@ import ( "testing" // Plug in CoreDNS, needed for AppVersion and AppName in this test. + "github.com/coredns/caddy" _ "github.com/coredns/coredns/coremain" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/test/presubmit_test.go b/test/presubmit_test.go index 7229b898e..44692b160 100644 --- a/test/presubmit_test.go +++ b/test/presubmit_test.go @@ -344,7 +344,7 @@ func (w *testImportOrderingWalker) walk(path string, info os.FileInfo, _ error) prevpos = line } // if it: - // contains strings github.com/coredns/coredns -> coredns + // contains strings github.com/coredns -> coredns // contains dots -> 3rd // no dots -> std ip := [3]string{} // type per block, just string, either std, coredns, 3rd @@ -392,7 +392,7 @@ func (w *testImportOrderingWalker) walk(path string, info os.FileInfo, _ error) } func importtype(s string) string { - if strings.Contains(s, "github.com/coredns/coredns") { + if strings.Contains(s, "github.com/coredns") { return "coredns" } if strings.Contains(s, ".") { diff --git a/test/readme_test.go b/test/readme_test.go index 38fbcc0e2..50f0adc7e 100644 --- a/test/readme_test.go +++ b/test/readme_test.go @@ -10,9 +10,8 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" - - "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 diff --git a/test/server.go b/test/server.go index 254b1b503..ac020d379 100644 --- a/test/server.go +++ b/test/server.go @@ -3,11 +3,10 @@ package test import ( "sync" + "github.com/coredns/caddy" _ "github.com/coredns/coredns/core" // Hook in CoreDNS. "github.com/coredns/coredns/core/dnsserver" _ "github.com/coredns/coredns/core/plugin" // Load all managed plugins in github.com/coredns/coredns. - - "github.com/caddyserver/caddy" ) var mu sync.Mutex |