TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

plugin/etcd: make the address of upstream optional (#2262)

Browse source 
Automatically submitted.
This commit is contained in:
Jiacheng Xu 2018-11-02 20:52:12 +01:00 • committed by corbot[bot]
parent 05204ef142
commit 1a01e13db8
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugin/etcd/setup.go
View file

@ -92,9 +92,6 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) {
endpoints = args
case "upstream":
args := c.RemainingArgs()
if len(args) == 0 {
return nil, false, c.ArgErr()
}
u, err := upstream.New(args)
if err != nil {
return nil, false, err

14
plugin/etcd/setup_test.go
View file

@ -30,6 +30,20 @@ func TestSetupEtcd(t *testing.T) {
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
{