Skip to content
Merged
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
35 changes: 23 additions & 12 deletions keep/providers/sentry_provider/sentry_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,16 @@ def get_template(self):
def get_parameters(self):
return {}

@staticmethod
def _extract_error_detail(response: requests.Response) -> str:
try:
response_json = response.json()
if isinstance(response_json, dict):
return response_json.get("detail") or str(response_json)
except Exception:
pass
return f"HTTP {response.status_code}"

def validate_scopes(self) -> dict[str, bool | str]:
validated_scopes = {}
project_slug = None
Expand All @@ -166,27 +176,30 @@ def validate_scopes(self) -> dict[str, bool | str]:
headers=self.__headers,
)
if not response.ok:
response_json = response.json()
validated_scopes[scope.name] = response_json.get("detail")
validated_scopes[scope.name] = self._extract_error_detail(response)
continue
else:
projects_response = requests.get(
f"{self.sentry_api}/projects/",
headers=self.__headers,
)
if not projects_response.ok:
response_json = projects_response.json()
validated_scopes[scope.name] = response_json.get("detail")
validated_scopes[scope.name] = self._extract_error_detail(projects_response)
continue
try:
projects = projects_response.json()
project_slug = projects[0].get("slug") if projects else None
except Exception:
project_slug = None
if not project_slug:
validated_scopes[scope.name] = "No projects found"
continue
projects = projects_response.json()
project_slug = projects[0].get("slug")
response = requests.get(
f"{self.sentry_api}/projects/{self.sentry_org_slug}/{project_slug}/issues/",
headers=self.__headers,
)
if not response.ok:
response_json = response.json()
validated_scopes[scope.name] = response_json.get("detail")
validated_scopes[scope.name] = self._extract_error_detail(response)
continue
validated_scopes[scope.name] = True
elif scope.name == "project:read":
Expand All @@ -195,8 +208,7 @@ def validate_scopes(self) -> dict[str, bool | str]:
headers=self.__headers,
)
if not response.ok:
response_json = response.json()
validated_scopes[scope.name] = response_json.get("detail")
validated_scopes[scope.name] = self._extract_error_detail(response)
continue
validated_scopes[scope.name] = True
elif scope.name == "project:write":
Expand All @@ -205,8 +217,7 @@ def validate_scopes(self) -> dict[str, bool | str]:
headers=self.__headers,
)
if not response.ok:
response_json = response.json()
validated_scopes[scope.name] = response_json.get("detail")
validated_scopes[scope.name] = self._extract_error_detail(response)
continue
validated_scopes[scope.name] = True
return validated_scopes
Expand Down
Loading