Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,6 @@ module = [
"sentry.sentry_apps.api.parsers.*",
"sentry.sentry_apps.api.serializers.*",
"sentry.sentry_apps.components",
"sentry.sentry_apps.external_requests.*",
"sentry.sentry_apps.installations",
"sentry.sentry_apps.logic",
"sentry.sentry_apps.metrics",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
SentryAppInteractionEvent,
SentryAppInteractionType,
)
from sentry.sentry_apps.models.sentry_app import SentryApp
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
from sentry.sentry_apps.services.app.model import RpcSentryAppInstallation
from sentry.sentry_apps.services.app.model import RpcSentryApp, RpcSentryAppInstallation
from sentry.sentry_apps.utils.errors import SentryAppErrorType, SentryAppIntegratorError
from sentry.utils import json

Expand Down Expand Up @@ -160,7 +161,7 @@ def _get_response_message(self, response: Response | None, default_message: str)
return f"{self.sentry_app.name}: {message}"

@cached_property
def body(self):
def body(self) -> str:
return json.dumps(
{
"fields": self.fields,
Expand All @@ -169,5 +170,5 @@ def body(self):
)

@cached_property
def sentry_app(self):
def sentry_app(self) -> SentryApp | RpcSentryApp:
return self.install.sentry_app
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
SentryAppInteractionEvent,
SentryAppInteractionType,
)
from sentry.sentry_apps.models.sentry_app import SentryApp
from sentry.sentry_apps.services.app import RpcSentryAppInstallation
from sentry.sentry_apps.services.app.model import RpcSentryApp
from sentry.sentry_apps.utils.errors import SentryAppIntegratorError
from sentry.users.models.user import User
from sentry.users.services.user import RpcUser
Expand Down Expand Up @@ -185,7 +187,7 @@ def _build_headers(self) -> dict[str, str]:
}

@cached_property
def body(self):
def body(self) -> str:
body: dict[str, Any] = {
"fields": {},
"issueId": self.group.id,
Expand All @@ -199,5 +201,5 @@ def body(self):
return json.dumps(body)

@cached_property
def sentry_app(self):
def sentry_app(self) -> SentryApp | RpcSentryApp:
return self.install.sentry_app
12 changes: 3 additions & 9 deletions src/sentry/sentry_apps/external_requests/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import re
from collections.abc import Mapping
from typing import Any
from typing import Any, Literal
from urllib.parse import urlparse

from jsonschema import Draft7Validator
Expand Down Expand Up @@ -94,14 +94,8 @@ def integrator_error_message(response: Response | None, fallback: str) -> str:
SCHEMA_LIST = {"select": SELECT_OPTIONS_SCHEMA, "issue_link": ISSUE_LINKER_SCHEMA}


def validate(instance, schema_type):
schema = SCHEMA_LIST[schema_type]
v = Draft7Validator(schema)

if not v.is_valid(instance):
return False

return True
def validate(instance: object, schema_type: Literal["select", "issue_link"]) -> bool:
return Draft7Validator(SCHEMA_LIST[schema_type]).is_valid(instance)


def send_and_save_sentry_app_request(
Expand Down
Loading