aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yong Tang <yong.tang.github@outlook.com> 2023-10-27 13:44:11 -0700
committerGravatar GitHub <noreply@github.com> 2023-10-27 22:44:11 +0200
commit430e3ad9863cc18577c58e258a98696479fa1cc6 (patch)
tree57198050f468256d2a5ddaa03e93617ec519b9a8
parent1403a1a3610e3771a6dbfc88537fa8115e62d172 (diff)
downloadcoredns-430e3ad9863cc18577c58e258a98696479fa1cc6.tar.gz
coredns-430e3ad9863cc18577c58e258a98696479fa1cc6.tar.zst
coredns-430e3ad9863cc18577c58e258a98696479fa1cc6.zip
Update expr from 1.13.0 to 1.15.3 (#6375)
Manually update expr to resolve test failures Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--plugin/view/setup.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/go.mod b/go.mod
index dba5e4eb9..a0e1de63f 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
- github.com/antonmedv/expr v1.13.0
+ github.com/antonmedv/expr v1.15.3
github.com/apparentlymart/go-cidr v1.1.0
github.com/aws/aws-sdk-go v1.46.1
github.com/coredns/caddy v1.1.1
diff --git a/go.sum b/go.sum
index 48be26d32..a1954f457 100644
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,8 @@ github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpz
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/antonmedv/expr v1.13.0 h1:8YrTtlCzlOtXw+hpeCLDLL2uo0C0k6jmYpYTGws5c5w=
-github.com/antonmedv/expr v1.13.0/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU=
+github.com/antonmedv/expr v1.15.3 h1:q3hOJZNvLvhqE8OHBs1cFRdbXFNKuA+bHmRaI+AmRmI=
+github.com/antonmedv/expr v1.15.3/go.mod h1:0E/6TxnOlRNp81GMzX9QfDPAmHo2Phg00y4JUv1ihsE=
github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
github.com/aws/aws-sdk-go v1.46.1 h1:U26quvBWFZMQuultLw5tloW4GnmWaChEwMZNq8uYatw=
diff --git a/plugin/view/setup.go b/plugin/view/setup.go
index 34ecc7960..77ef791bc 100644
--- a/plugin/view/setup.go
+++ b/plugin/view/setup.go
@@ -47,7 +47,7 @@ func parse(c *caddy.Controller) (*View, error) {
switch c.Val() {
case "expr":
args := c.RemainingArgs()
- prog, err := expr.Compile(strings.Join(args, " "), expr.Env(expression.DefaultEnv(context.Background(), nil)))
+ prog, err := expr.Compile(strings.Join(args, " "), expr.Env(expression.DefaultEnv(context.Background(), nil)), expr.DisableBuiltin("type"))
if err != nil {
return v, err
}