wrapped validation errors with ErrInvalidExpression

moira-alert · Aug 14, 2023 · 5245495 · 5245495
1 parent c302f68
commit 5245495
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/expression/expression.go b/expression/expression.go
@@ -85,7 +85,9 @@ func (triggerExpression *TriggerExpression) Validate() error {
 		return nil
 	}
 	if triggerExpression.Expression == nil || *triggerExpression.Expression == "" {
-		return fmt.Errorf("trigger_type set to expression, but no expression provided")
+		return ErrInvalidExpression{
+			internalError: fmt.Errorf("trigger_type set to expression, but no expression provided"),
+		}
 	}
 	expression := *triggerExpression.Expression
 	env := map[string]interface{}{
@@ -106,12 +108,14 @@ func (triggerExpression *TriggerExpression) Validate() error {
 	for k, v := range triggerExpression.AdditionalTargetsValues {
 		env[k] = v
 	}
-	_, err := expr.Compile(
+	if _, err := expr.Compile(
 		strings.ToLower(expression),
 		expr.Optimize(true),
 		expr.Env(env),
-	)
-	return err
+	); err != nil {
+		return ErrInvalidExpression{err}
+	}
+	return nil
 }
 
 // Evaluate gets trigger expression and evaluates it for given parameters using govaluate

diff --git a/expression/expression_test.go b/expression/expression_test.go
@@ -106,7 +106,7 @@ func TestValidate(t *testing.T) {
 	})
 	Convey("Test bad expressions", t, func() {
 		err := (&TriggerExpression{Expression: nil, TriggerType: moira.ExpressionTrigger}).Validate()
-		So(err, ShouldResemble, fmt.Errorf("trigger_type set to expression, but no expression provided"))
+		So(err, ShouldResemble, ErrInvalidExpression{fmt.Errorf("trigger_type set to expression, but no expression provided")})
 	})
 	Convey("Test invalid expressions", t, func() {
 		expression := "t1 > 10 && t2 > 3 ? OK : ddd"