Abstract the caddy call and make it simpler. See #3261 for some part of the discussion. Go from: ~~~ go func init() { caddy.RegisterPlugin("any", caddy.Plugin{ ServerType: "dns", Action: setup, }) } ~~~ To: ~~~ go func init() { plugin.Register("any", setup) } ~~~ This requires some external documents in coredns.io to be updated as well; the old way still works, so it's backwards compatible. Signed-off-by: Miek Gieben <miek@miek.nl>
56 lines
1.1 KiB
Go
56 lines
1.1 KiB
Go
package metadata
|
|
|
|
import (
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
|
|
"github.com/caddyserver/caddy"
|
|
)
|
|
|
|
func init() { plugin.Register("metadata", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
m, err := metadataParse(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
m.Next = next
|
|
return m
|
|
})
|
|
|
|
c.OnStartup(func() error {
|
|
plugins := dnsserver.GetConfig(c).Handlers()
|
|
for _, p := range plugins {
|
|
if met, ok := p.(Provider); ok {
|
|
m.Providers = append(m.Providers, met)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func metadataParse(c *caddy.Controller) (*Metadata, error) {
|
|
m := &Metadata{}
|
|
c.Next()
|
|
zones := c.RemainingArgs()
|
|
|
|
if len(zones) != 0 {
|
|
m.Zones = zones
|
|
for i := 0; i < len(m.Zones); i++ {
|
|
m.Zones[i] = plugin.Host(m.Zones[i]).Normalize()
|
|
}
|
|
} else {
|
|
m.Zones = make([]string, len(c.ServerBlockKeys))
|
|
for i := 0; i < len(c.ServerBlockKeys); i++ {
|
|
m.Zones[i] = plugin.Host(c.ServerBlockKeys[i]).Normalize()
|
|
}
|
|
}
|
|
|
|
if c.NextBlock() || c.Next() {
|
|
return nil, plugin.Error("metadata", c.ArgErr())
|
|
}
|
|
return m, nil
|
|
}
|