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

just use setup (#1574)

Browse Source 
All these functions are namespaced by their package anyway; just use
setup().
This commit is contained in:
Miek Gieben
2018-02-28 19:56:14 -08:00
committed by GitHub
parent 4f3dc207a4
commit 654b88d8c4
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/bind/bind.go
View File

@@ -6,6 +6,6 @@ import "github.com/mholt/caddy"
func init() { func init() {
caddy.RegisterPlugin("bind", caddy.Plugin{ caddy.RegisterPlugin("bind", caddy.Plugin{
ServerType: "dns", ServerType: "dns",
Action: setupBind, Action: setup,
}) })
} }

4
plugin/bind/bind_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
func TestSetupBind(t *testing.T) { func TestSetup(t *testing.T) {
for i, test := range []struct { for i, test := range []struct {
config string config string
expected []string expected []string
@@ -22,7 +22,7 @@ func TestSetupBind(t *testing.T) {
{`bind ::1 1.2.3.4 ::5 127.9.9.0 noone`, nil, true}, {`bind ::1 1.2.3.4 ::5 127.9.9.0 noone`, nil, true},
} { } {
c := caddy.NewTestController("dns", test.config) c := caddy.NewTestController("dns", test.config)
err := setupBind(c) err := setup(c)
if err != nil { if err != nil {
if !test.failing { if !test.failing {
t.Fatalf("test %d, expected no errors, but got: %v", i, err) t.Fatalf("test %d, expected no errors, but got: %v", i, err)

2
plugin/bind/setup.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
func setupBind(c *caddy.Controller) error { func setup(c *caddy.Controller) error {
config := dnsserver.GetConfig(c) config := dnsserver.GetConfig(c)
// addresses will be consolidated over all BIND directives available in that BlocServer // addresses will be consolidated over all BIND directives available in that BlocServer

4
plugin/erratic/setup.go
View File

@@ -14,11 +14,11 @@ import (
func init() { func init() {
caddy.RegisterPlugin("erratic", caddy.Plugin{ caddy.RegisterPlugin("erratic", caddy.Plugin{
ServerType: "dns", ServerType: "dns",
Action: setupErratic, Action: setup,
}) })
} }
func setupErratic(c *caddy.Controller) error { func setup(c *caddy.Controller) error {
e, err := parseErratic(c) e, err := parseErratic(c)
if err != nil { if err != nil {
return plugin.Error("erratic", err) return plugin.Error("erratic", err)

8
plugin/erratic/setup_test.go
View File

@@ -6,23 +6,23 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
func TestSetupErratic(t *testing.T) { func TestSetup(t *testing.T) {
c := caddy.NewTestController("dns", `erratic { c := caddy.NewTestController("dns", `erratic {
drop drop
}`) }`)
if err := setupErratic(c); err != nil { if err := setup(c); err != nil {
t.Fatalf("Test 1, expected no errors, but got: %q", err) t.Fatalf("Test 1, expected no errors, but got: %q", err)
} }
c = caddy.NewTestController("dns", `erratic`) c = caddy.NewTestController("dns", `erratic`)
if err := setupErratic(c); err != nil { if err := setup(c); err != nil {
t.Fatalf("Test 2, expected no errors, but got: %q", err) t.Fatalf("Test 2, expected no errors, but got: %q", err)
} }
c = caddy.NewTestController("dns", `erratic { c = caddy.NewTestController("dns", `erratic {
drop -1 drop -1
}`) }`)
if err := setupErratic(c); err == nil { if err := setup(c); err == nil {
t.Fatalf("Test 4, expected errors, but got: %q", err) t.Fatalf("Test 4, expected errors, but got: %q", err)
} }
} }

4
plugin/reverse/setup.go
View File

@@ -17,11 +17,11 @@ import (
func init() { func init() {
caddy.RegisterPlugin("reverse", caddy.Plugin{ caddy.RegisterPlugin("reverse", caddy.Plugin{
ServerType: "dns", ServerType: "dns",
Action: setupReverse, Action: setup,
}) })
} }
func setupReverse(c *caddy.Controller) error { func setup(c *caddy.Controller) error {
networks, fall, err := reverseParse(c) networks, fall, err := reverseParse(c)
if err != nil { if err != nil {
return plugin.Error("reverse", err) return plugin.Error("reverse", err)

2
plugin/reverse/setup_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
func TestSetupParse(t *testing.T) { func TestSetup(t *testing.T) {
_, net4, _ := net.ParseCIDR("10.1.1.0/24") _, net4, _ := net.ParseCIDR("10.1.1.0/24")
_, net6, _ := net.ParseCIDR("fd01::/64") _, net6, _ := net.ParseCIDR("fd01::/64")

4
plugin/whoami/setup.go
View File

@@ -10,11 +10,11 @@ import (
func init() { func init() {
caddy.RegisterPlugin("whoami", caddy.Plugin{ caddy.RegisterPlugin("whoami", caddy.Plugin{
ServerType: "dns", ServerType: "dns",
Action: setupWhoami, Action: setup,
}) })
} }
func setupWhoami(c *caddy.Controller) error { func setup(c *caddy.Controller) error {
c.Next() // 'whoami' c.Next() // 'whoami'
if c.NextArg() { if c.NextArg() {
return plugin.Error("whoami", c.ArgErr()) return plugin.Error("whoami", c.ArgErr())

6
plugin/whoami/setup_test.go
View File

@@ -6,14 +6,14 @@ import (
"github.com/mholt/caddy" "github.com/mholt/caddy"
) )
func TestSetupWhoami(t *testing.T) { func TestSetup(t *testing.T) {
c := caddy.NewTestController("dns", `whoami`) c := caddy.NewTestController("dns", `whoami`)
if err := setupWhoami(c); err != nil { if err := setup(c); err != nil {
t.Fatalf("Expected no errors, but got: %v", err) t.Fatalf("Expected no errors, but got: %v", err)
} }
c = caddy.NewTestController("dns", `whoami example.org`) c = caddy.NewTestController("dns", `whoami example.org`)
if err := setupWhoami(c); err == nil { if err := setup(c); err == nil {
t.Fatalf("Expected errors, but got: %v", err) t.Fatalf("Expected errors, but got: %v", err)
} }
} }