* Upgrade antonmedv/expr to expr-lang/expr The project has moved. This also upgrades from 1.15.5 to 1.16.9. The expr project lacks a changelog but tests pass and the changes don't seem to change it much - but there were a lot of changes. Signed-off-by: Kevin Lyda <kevin@lyda.ie> * Upgrade build image In reviewing the build results I see the old build image was deprecated so upgrading to something newer. Signed-off-by: Kevin Lyda <kevin@lyda.ie> --------- Signed-off-by: Kevin Lyda <kevin@lyda.ie>
65 lines
1.2 KiB
Go
65 lines
1.2 KiB
Go
package view
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/plugin/pkg/expression"
|
|
|
|
"github.com/expr-lang/expr"
|
|
)
|
|
|
|
func init() { plugin.Register("view", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
cond, err := parse(c)
|
|
if err != nil {
|
|
return plugin.Error("view", err)
|
|
}
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
cond.Next = next
|
|
return cond
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func parse(c *caddy.Controller) (*View, error) {
|
|
v := new(View)
|
|
|
|
i := 0
|
|
for c.Next() {
|
|
i++
|
|
if i > 1 {
|
|
return nil, plugin.ErrOnce
|
|
}
|
|
args := c.RemainingArgs()
|
|
if len(args) != 1 {
|
|
return nil, c.ArgErr()
|
|
}
|
|
v.viewName = args[0]
|
|
|
|
for c.NextBlock() {
|
|
switch c.Val() {
|
|
case "expr":
|
|
args := c.RemainingArgs()
|
|
prog, err := expr.Compile(strings.Join(args, " "), expr.Env(expression.DefaultEnv(context.Background(), nil)), expr.DisableBuiltin("type"))
|
|
if err != nil {
|
|
return v, err
|
|
}
|
|
v.progs = append(v.progs, prog)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
continue
|
|
default:
|
|
return nil, c.Errf("unknown property '%s'", c.Val())
|
|
}
|
|
}
|
|
}
|
|
return v, nil
|
|
}
|