From ff19f4a5cf9cf9b4cdfd2b42399fd6b345c3f4f7 Mon Sep 17 00:00:00 2001
From: Anton Sattarov <sattarov@perx.ru>
Date: Fri, 4 Oct 2024 09:45:06 +0000
Subject: [PATCH] =?UTF-8?q?chore:=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20?=
=?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20?=
=?UTF-8?q?expr=20v1.16.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Close #PRXS-2789
---
go.mod | 2 +-
go.sum | 4 ++--
pkg/expr/config.go | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 372a5f1f..a8223532 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.22
require (
github.com/avast/retry-go/v4 v4.5.1
github.com/bep/gowebp v0.2.0
- github.com/expr-lang/expr v1.15.8
+ github.com/expr-lang/expr v1.16.9
github.com/go-kit/kit v0.13.0
github.com/gosimple/slug v1.13.1
github.com/hashicorp/go-multierror v1.1.1
diff --git a/go.sum b/go.sum
index 7f00103f..4beab20d 100644
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/expr-lang/expr v1.15.8 h1:FL8+d3rSSP4tmK9o+vKfSMqqpGL8n15pEPiHcnBpxoI=
-github.com/expr-lang/expr v1.15.8/go.mod h1:uCkhfG+x7fcZ5A5sXHKuQ07jGZRl6J0FCAaf2k4PtVQ=
+github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
+github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU=
github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg=
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
diff --git a/pkg/expr/config.go b/pkg/expr/config.go
index e6ba9d90..130342b8 100644
--- a/pkg/expr/config.go
+++ b/pkg/expr/config.go
@@ -16,7 +16,6 @@ func (c *ExprConfig) RegisterOption(opt ...expr.Option) {
func (c *ExprConfig) GetConfig(e map[string]interface{}) *conf.Config {
cfg := conf.New(e)
- cfg.Operators = make(map[string][]string)
for _, opt := range c.options {
opt(cfg)
}
@@ -38,9 +37,9 @@ func GetDefaultConfig(e map[string]interface{}) *conf.Config {
return defaultConfig.GetConfig(e)
}
-//func GetDefaultEnv(e map[string]interface{}) map[string]interface{} {
+// func GetDefaultEnv(e map[string]interface{}) map[string]interface{} {
// return defaultConfig.GetEnv(e)
-//}
+// }
func Extend(kv ...interface{}) expr.Option {
e := make(map[string]interface{})
--
GitLab