From 2e816bf5145af29661a108adcc24a71cbde5925e Mon Sep 17 00:00:00 2001 From: mzack Date: Tue, 17 Aug 2021 14:06:49 +0200 Subject: [PATCH 1/2] Fixing some DSL helpers logic --- v2/pkg/operators/common/dsl/dsl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/pkg/operators/common/dsl/dsl.go b/v2/pkg/operators/common/dsl/dsl.go index 841e83fc3..c9f27955b 100644 --- a/v2/pkg/operators/common/dsl/dsl.go +++ b/v2/pkg/operators/common/dsl/dsl.go @@ -52,7 +52,7 @@ var functions = map[string]govaluate.ExpressionFunction{ return compiled.ReplaceAllString(types.ToString(args[0]), types.ToString(args[2])), nil }, "trim": func(args ...interface{}) (interface{}, error) { - return strings.Trim(types.ToString(args[0]), types.ToString(args[2])), nil + return strings.Trim(types.ToString(args[0]), types.ToString(args[1])), nil }, "trimleft": func(args ...interface{}) (interface{}, error) { return strings.TrimLeft(types.ToString(args[0]), types.ToString(args[1])), nil From ea9b700bf063d6419d35219ed73db219f8601889 Mon Sep 17 00:00:00 2001 From: mzack Date: Tue, 17 Aug 2021 14:14:47 +0200 Subject: [PATCH 2/2] more fixes --- v2/pkg/operators/common/dsl/dsl.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/v2/pkg/operators/common/dsl/dsl.go b/v2/pkg/operators/common/dsl/dsl.go index c9f27955b..5c6871c6b 100644 --- a/v2/pkg/operators/common/dsl/dsl.go +++ b/v2/pkg/operators/common/dsl/dsl.go @@ -162,7 +162,7 @@ var functions = map[string]govaluate.ExpressionFunction{ base := letters + numbers if len(args) >= 1 { - l = args[0].(int) + l = int(args[0].(float64)) } if len(args) >= withCutSetArgsSize { bad = types.ToString(args[1]) @@ -179,7 +179,7 @@ var functions = map[string]govaluate.ExpressionFunction{ chars := letters + numbers if len(args) >= 1 { - l = args[0].(int) + l = int(args[0].(float64)) } if len(args) >= withCutSetArgsSize { bad = types.ToString(args[1]) @@ -193,7 +193,7 @@ var functions = map[string]govaluate.ExpressionFunction{ chars := letters if len(args) >= 1 { - l = args[0].(int) + l = int(args[0].(float64)) } if len(args) >= withCutSetArgsSize { bad = types.ToString(args[1]) @@ -207,7 +207,7 @@ var functions = map[string]govaluate.ExpressionFunction{ chars := numbers if len(args) >= 1 { - l = args[0].(int) + l = int(args[0].(float64)) } if len(args) >= withCutSetArgsSize { bad = types.ToString(args[1])