chore: fix linter warning

pull/4358/head
johnnyjoy 5 months ago
parent 364f005ee5
commit b734d429ec

@ -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 != nil {
return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
} }
if _, err := filter.Parse(newShortcut.Filter, filter.MemoFilterCELAttributes...); err != nil {
return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err)
} }
if request.ValidateOnly { if request.ValidateOnly {
return &v1pb.Shortcut{ return &v1pb.Shortcut{
@ -175,13 +173,11 @@ 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()
} }
} }

Loading…
Cancel
Save