Browse Source

consolidate InvalidParams exception (#62273)

Nathan Hsieh 1 year ago
parent
commit
d10d064e5b

+ 2 - 5
src/sentry/api/bases/organization.py

@@ -13,13 +13,10 @@ from sentry.api.base import Endpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.helpers.environments import get_environments
 from sentry.api.permissions import SentryPermission
-from sentry.api.utils import (
-    InvalidParams,
-    get_date_range_from_params,
-    is_member_disabled_from_limit,
-)
+from sentry.api.utils import get_date_range_from_params, is_member_disabled_from_limit
 from sentry.auth.superuser import is_active_superuser
 from sentry.constants import ALL_ACCESS_PROJECTS, ALL_ACCESS_PROJECTS_SLUG, ObjectStatus
+from sentry.exceptions import InvalidParams
 from sentry.models.apikey import is_api_key_auth
 from sentry.models.environment import Environment
 from sentry.models.organization import Organization

+ 2 - 1
src/sentry/api/bases/project.py

@@ -10,8 +10,9 @@ from sentry_sdk import Scope
 from sentry.api.base import Endpoint
 from sentry.api.exceptions import ProjectMoved, ResourceDoesNotExist
 from sentry.api.helpers.environments import get_environments
-from sentry.api.utils import InvalidParams, get_date_range_from_params
+from sentry.api.utils import get_date_range_from_params
 from sentry.constants import ObjectStatus
+from sentry.exceptions import InvalidParams
 from sentry.models.project import Project
 from sentry.models.projectredirect import ProjectRedirect
 from sentry.utils.sdk import bind_organization_context, configure_scope

+ 2 - 2
src/sentry/api/endpoints/group_events.py

@@ -18,9 +18,9 @@ from sentry.api.helpers.environments import get_environments
 from sentry.api.helpers.events import get_direct_hit_response, get_query_builder_for_group
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.serializers import EventSerializer, SimpleEventSerializer, serialize
-from sentry.api.utils import InvalidParams, get_date_range_from_params
+from sentry.api.utils import get_date_range_from_params
 from sentry.eventstore.models import Event
-from sentry.exceptions import InvalidSearchQuery
+from sentry.exceptions import InvalidParams, InvalidSearchQuery
 from sentry.search.utils import InvalidQuery, parse_query
 
 if TYPE_CHECKING:

+ 2 - 1
src/sentry/api/endpoints/organization_ddm.py

@@ -11,7 +11,8 @@ from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.code_locations import CodeLocationsSerializer
 from sentry.api.serializers.models.metric_spans import MetricSpansSerializer
-from sentry.api.utils import InvalidParams, get_date_range_from_params
+from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams
 from sentry.sentry_metrics.querying.metadata.code_locations import get_code_locations
 from sentry.sentry_metrics.querying.metadata.metric_spans import get_spans_of_metric
 

+ 1 - 1
src/sentry/api/endpoints/organization_events.py

@@ -12,11 +12,11 @@ from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
-from sentry.api.utils import InvalidParams
 from sentry.apidocs import constants as api_constants
 from sentry.apidocs.examples.discover_performance_examples import DiscoverAndPerformanceExamples
 from sentry.apidocs.parameters import GlobalParams, OrganizationParams, VisibilityParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
+from sentry.exceptions import InvalidParams
 from sentry.models.organization import Organization
 from sentry.ratelimits.config import RateLimitConfig
 from sentry.snuba import discover, metrics_enhanced_performance, metrics_performance

+ 2 - 2
src/sentry/api/endpoints/organization_group_index.py

@@ -26,9 +26,9 @@ from sentry.api.helpers.group_index.validators import ValidationError
 from sentry.api.paginator import DateTimePaginator, Paginator
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.group_stream import StreamGroupSerializerSnuba
-from sentry.api.utils import InvalidParams, get_date_range_from_stats_period
+from sentry.api.utils import get_date_range_from_stats_period
 from sentry.constants import ALLOWED_FUTURE_DELTA
-from sentry.exceptions import InvalidSearchQuery
+from sentry.exceptions import InvalidParams, InvalidSearchQuery
 from sentry.models.environment import Environment
 from sentry.models.group import QUERY_STATUS_LOOKUP, Group, GroupStatus
 from sentry.models.groupenvironment import GroupEnvironment

+ 2 - 1
src/sentry/api/endpoints/organization_group_index_stats.py

@@ -9,7 +9,8 @@ from sentry.api.endpoints.organization_group_index import ERR_INVALID_STATS_PERI
 from sentry.api.helpers.group_index import build_query_params_from_request, calculate_stats_period
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.group_stream import StreamGroupSerializerSnuba
-from sentry.api.utils import InvalidParams, get_date_range_from_stats_period
+from sentry.api.utils import get_date_range_from_stats_period
+from sentry.exceptions import InvalidParams
 from sentry.models.group import Group
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 

+ 2 - 1
src/sentry/api/endpoints/organization_issues_count.py

@@ -10,7 +10,8 @@ from sentry.api.bases import OrganizationEventsEndpointBase
 from sentry.api.helpers.group_index import validate_search_filter_permissions
 from sentry.api.helpers.group_index.validators import ValidationError
 from sentry.api.issue_search import convert_query_values, parse_search_query
-from sentry.api.utils import InvalidParams, get_date_range_from_params
+from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams
 from sentry.snuba import discover
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 

+ 2 - 2
src/sentry/api/endpoints/organization_metrics.py

@@ -8,7 +8,8 @@ from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.paginator import GenericOffsetPaginator
-from sentry.api.utils import InvalidParams, get_date_range_from_params
+from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams
 from sentry.sentry_metrics.querying.api import (
     InvalidMetricsQueryError,
     MetricsQueryExecutionError,
@@ -74,7 +75,6 @@ class OrganizationMetricDetailsEndpoint(OrganizationEndpoint):
     def get(self, request: Request, organization, metric_name) -> Response:
         projects = self.get_projects(request, organization)
         try:
-
             metric = get_single_metric_info(
                 projects,
                 metric_name,

+ 2 - 1
src/sentry/api/endpoints/organization_sessions.py

@@ -14,8 +14,9 @@ from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams
 from sentry.models.organization import Organization
-from sentry.snuba.sessions_v2 import SNUBA_LIMIT, InvalidField, InvalidParams, QueryDefinition
+from sentry.snuba.sessions_v2 import SNUBA_LIMIT, InvalidField, QueryDefinition
 from sentry.utils.cursors import Cursor, CursorResult
 
 

Some files were not shown because too many files changed in this diff