Skip to content

Commit

Permalink
fix: linter warning
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyjoygh committed Feb 2, 2025
1 parent 2d731c5 commit 58a867e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 18 deletions.
37 changes: 20 additions & 17 deletions plugin/filter/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ var MemoFilterCELAttributes = []cel.EnvOption{

// Parse parses the filter string and returns the parsed expression.
// The filter string should be a CEL expression.
func Parse(filter string) (expr *exprv1.ParsedExpr, err error) {
e, err := cel.NewEnv(MemoFilterCELAttributes...)
func Parse(filter string, opts ...cel.EnvOption) (expr *exprv1.ParsedExpr, err error) {
e, err := cel.NewEnv(opts...)
if err != nil {
return nil, errors.Wrap(err, "failed to create CEL environment")
}
Expand All @@ -28,20 +28,23 @@ func Parse(filter string) (expr *exprv1.ParsedExpr, err error) {

// GetConstValue returns the constant value of the expression.
func GetConstValue(expr *exprv1.Expr) (any, error) {
switch v := expr.ExprKind.(type) {
case *exprv1.Expr_ConstExpr:
switch v.ConstExpr.ConstantKind.(type) {
case *exprv1.Constant_StringValue:
return v.ConstExpr.GetStringValue(), nil
case *exprv1.Constant_Int64Value:
return v.ConstExpr.GetInt64Value(), nil
case *exprv1.Constant_Uint64Value:
return v.ConstExpr.GetUint64Value(), nil
case *exprv1.Constant_DoubleValue:
return v.ConstExpr.GetDoubleValue(), nil
case *exprv1.Constant_BoolValue:
return v.ConstExpr.GetBoolValue(), nil
}
v, ok := expr.ExprKind.(*exprv1.Expr_ConstExpr)
if !ok {
return nil, errors.New("invalid constant expression")
}

switch v.ConstExpr.ConstantKind.(type) {
case *exprv1.Constant_StringValue:
return v.ConstExpr.GetStringValue(), nil
case *exprv1.Constant_Int64Value:
return v.ConstExpr.GetInt64Value(), nil
case *exprv1.Constant_Uint64Value:
return v.ConstExpr.GetUint64Value(), nil
case *exprv1.Constant_DoubleValue:
return v.ConstExpr.GetDoubleValue(), nil
case *exprv1.Constant_BoolValue:
return v.ConstExpr.GetBoolValue(), nil
default:
return nil, errors.New("unexpected constant type")
}
return nil, errors.New("invalid constant expression")
}
2 changes: 1 addition & 1 deletion store/db/sqlite/memo_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestRestoreExprToSQL(t *testing.T) {
}

for _, tt := range tests {
parsedExpr, err := filter.Parse(tt.filter)
parsedExpr, err := filter.Parse(tt.filter, filter.MemoFilterCELAttributes...)
require.NoError(t, err)
result, err := RestoreExprToSQL(parsedExpr.GetExpr())
require.NoError(t, err)
Expand Down

0 comments on commit 58a867e

Please sign in to comment.