Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

For caddy v1 in our org (#4018)

Browse Source 
* 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>
This commit is contained in:
Miek Gieben
2020-09-24 18:14:41 +02:00
committed by GitHub
parent 24e668ecf0
commit b003d06003
121 changed files with 135 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/chaos_test.go
View File

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

4
test/presubmit_test.go
View File

@@ -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, ".") {

3
test/readme_test.go
View File

@@ -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

3
test/server.go
View File

@@ -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