fix(issues): Return 400 for InvalidSearchQuery during bulk delete and update

src/sentry/api/helpers/group_index/delete.py

@@ -18,6 +18,7 @@
 from sentry.apidocs.response_types import ValidationErrorResponse
 from sentry.deletions.defaults.group import GROUP_CHUNK_SIZE
 from sentry.deletions.tasks.groups import delete_groups_for_project
+from sentry.exceptions import InvalidSearchQuery
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupinbox import GroupInbox
 from sentry.models.project import Project
@@ -185,8 +186,11 @@
                     "paginator_options": {"max_limit": BULK_MUTATION_LIMIT},
                 }
             )
-        except ValidationError as exc:
+        except (ValidationError, InvalidSearchQuery) as exc:
+            # InvalidSearchQuery can be raised while building the Snuba query
+            # (e.g. `issue:` with a value that isn't a valid short ID), after
+            # parsing has already succeeded. It's a client error, not a 500.
             return Response({"detail": str(exc)}, status=400)
 
         group_list = list(cursor_result)
 

src/sentry/api/helpers/group_index/update.py

@@ -23,6 +23,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.actor import ActorSerializer, ActorSerializerResponse
 from sentry.api.serializers.models.groupactionlogentry import get_serialized_activity_items
+from sentry.exceptions import InvalidSearchQuery
 from sentry.hybridcloud.rpc import coerce_id_from
 from sentry.integrations.tasks.kick_off_status_syncs import kick_off_status_syncs
 from sentry.issues.action_log import (
@@ -332,6 +333,10 @@
             return Response(
                 {"detail": "Invalid query. Error getting group ids and group list"}, status=400
             )
+        except InvalidSearchQuery as exc:
+            # Raised while building the Snuba query (e.g. `issue:` with an
+            # invalid short ID). This is a client error; don't report it.
+            return Response({"detail": str(exc)}, status=400)
 
         group_list = list(cursor_result)