Commit b734d429 authored by johnnyjoy's avatar johnnyjoy

chore: fix linter warning

parent 364f005e
...@@ -80,11 +80,9 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS ...@@ -80,11 +80,9 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS
} }
if newShortcut.Filter == "" { if newShortcut.Filter == "" {
return nil, status.Errorf(codes.InvalidArgument, "filter is required") return nil, status.Errorf(codes.InvalidArgument, "filter is required")
} else { }
_, err := filter.Parse(newShortcut.Filter, filter.MemoFilterCELAttributes...) if _, err := filter.Parse(newShortcut.Filter, filter.MemoFilterCELAttributes...); err != nil {
if err != nil { return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
}
} }
if request.ValidateOnly { if request.ValidateOnly {
return &v1pb.Shortcut{ return &v1pb.Shortcut{
...@@ -175,12 +173,10 @@ func (s *APIV1Service) UpdateShortcut(ctx context.Context, request *v1pb.UpdateS ...@@ -175,12 +173,10 @@ func (s *APIV1Service) UpdateShortcut(ctx context.Context, request *v1pb.UpdateS
} else if field == "filter" { } else if field == "filter" {
if request.Shortcut.GetFilter() == "" { if request.Shortcut.GetFilter() == "" {
return nil, status.Errorf(codes.InvalidArgument, "filter is required") return nil, status.Errorf(codes.InvalidArgument, "filter is required")
} else { }
// Validate the filter. // Validate the filter.
_, err := filter.Parse(request.Shortcut.GetFilter(), filter.MemoFilterCELAttributes...) if _, err := filter.Parse(request.Shortcut.GetFilter(), filter.MemoFilterCELAttributes...); err != nil {
if err != nil { return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
}
} }
shortcut.Filter = request.Shortcut.GetFilter() shortcut.Filter = request.Shortcut.GetFilter()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment