9c16ed1d14
* Default to upstream to self This is a backwards incompatible change. This is a massive (cleanup) PR where we default to resolving external names by the coredns process itself, instead of directly forwarding them to some upstream. This ignores any arguments `upstream` may have had and makes it depend on proxy/forward configuration in the Corefile. This allows resolved upstream names to be cached and we have better healthchecking of the upstreams. It also means there is only one way to resolve names, by either using the proxy or forward plugin. The proxy/forward lookup.go functions have been removed. This also lessen the dependency on proxy, meaning deprecating proxy will become easier. Some tests have been removed as well, or moved to the top-level test directory as they now require a full coredns process instead of just the plugin. For the etcd plugin, the entire StubZone resolving is *dropped*! This was a hacky (but working) solution to say the least. If someone cares deeply it can be brought back (maybe)? The pkg/upstream is now very small and almost does nothing. Also the New() function was changed to return a pointer to upstream.Upstream. It also returns only one parameter, so any stragglers using it will encounter a compile error. All documentation has been adapted. This affected the following plugins: * etcd * file * auto * secondary * federation * template * route53 A followup PR will make any upstream directives with arguments an error, right now they are ignored. Signed-off-by: Miek Gieben <miek@miek.nl> * Fix etcd build - probably still fails unit test Signed-off-by: Miek Gieben <miek@miek.nl> * Slightly smarter lookup check in upstream Signed-off-by: Miek Gieben <miek@miek.nl> * Compilez Signed-off-by: Miek Gieben <miek@miek.nl>
91 lines
2.4 KiB
Go
91 lines
2.4 KiB
Go
package etcd
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mholt/caddy"
|
|
)
|
|
|
|
func TestSetupEtcd(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
shouldErr bool
|
|
expectedPath string
|
|
expectedEndpoint []string
|
|
expectedErrContent string // substring from the expected error. Empty for positive cases.
|
|
}{
|
|
// positive
|
|
{
|
|
`etcd`, false, "skydns", []string{"http://localhost:2379"}, "",
|
|
},
|
|
{
|
|
`etcd {
|
|
endpoint http://localhost:2379 http://localhost:3379 http://localhost:4379
|
|
|
|
}`, false, "skydns", []string{"http://localhost:2379", "http://localhost:3379", "http://localhost:4379"}, "",
|
|
},
|
|
{
|
|
`etcd skydns.local {
|
|
endpoint localhost:300
|
|
}
|
|
`, false, "skydns", []string{"localhost:300"}, "",
|
|
},
|
|
//test for upstream
|
|
{
|
|
`etcd {
|
|
endpoint localhost:300
|
|
upstream 8.8.8.8:53 8.8.4.4:53
|
|
}`, false, "skydns", []string{"localhost:300"}, "",
|
|
},
|
|
//test for optional upstream address
|
|
{
|
|
`etcd {
|
|
endpoint localhost:300
|
|
upstream
|
|
}`, false, "skydns", []string{"localhost:300"}, "",
|
|
},
|
|
// negative
|
|
{
|
|
`etcd {
|
|
endpoints localhost:300
|
|
}
|
|
`, true, "", []string{""}, "unknown property 'endpoints'",
|
|
},
|
|
}
|
|
|
|
for i, test := range tests {
|
|
c := caddy.NewTestController("dns", test.input)
|
|
etcd, err := etcdParse(c)
|
|
|
|
if test.shouldErr && err == nil {
|
|
t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
|
|
}
|
|
|
|
if err != nil {
|
|
if !test.shouldErr {
|
|
t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
|
|
continue
|
|
}
|
|
|
|
if !strings.Contains(err.Error(), test.expectedErrContent) {
|
|
t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
|
|
continue
|
|
}
|
|
}
|
|
|
|
if !test.shouldErr && etcd.PathPrefix != test.expectedPath {
|
|
t.Errorf("Etcd not correctly set for input %s. Expected: %s, actual: %s", test.input, test.expectedPath, etcd.PathPrefix)
|
|
}
|
|
if !test.shouldErr {
|
|
if len(etcd.endpoints) != len(test.expectedEndpoint) {
|
|
t.Errorf("Etcd not correctly set for input %s. Expected: '%+v', actual: '%+v'", test.input, test.expectedEndpoint, etcd.endpoints)
|
|
}
|
|
for i, endpoint := range etcd.endpoints {
|
|
if endpoint != test.expectedEndpoint[i] {
|
|
t.Errorf("Etcd not correctly set for input %s. Expected: '%+v', actual: '%+v'", test.input, test.expectedEndpoint, etcd.endpoints)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|