From 6b7d9dcd4f55ce77e50cc3074d8167874a62e5e2 Mon Sep 17 00:00:00 2001 From: anthony sottile Date: Fri, 14 Feb 2025 13:14:32 -0500 Subject: [PATCH] ref: get_group_{body,title,description} to not need request --- src/sentry/plugins/bases/issue.py | 12 ++++++------ src/sentry/plugins/bases/issue2.py | 12 ++++++------ src/sentry_plugins/jira/plugin.py | 4 ++-- src/sentry_plugins/redmine/plugin.py | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/sentry/plugins/bases/issue.py b/src/sentry/plugins/bases/issue.py index a9a42e0ac31dfb..36a55afa70f86e 100644 --- a/src/sentry/plugins/bases/issue.py +++ b/src/sentry/plugins/bases/issue.py @@ -33,7 +33,7 @@ class IssueTrackingPlugin(Plugin): def get_plugin_type(self): return "issue-tracking" - def _get_group_body(self, request: Request, group, event, **kwargs): + def _get_group_body(self, group, event, **kwargs): result = [] for interface in event.interfaces.values(): output = safe_execute(interface.to_string, event) @@ -41,15 +41,15 @@ def _get_group_body(self, request: Request, group, event, **kwargs): result.append(output) return "\n\n".join(result) - def _get_group_description(self, request: Request, group, event): + def _get_group_description(self, group, event): referrer = self.get_conf_key() + "_plugin" output = [absolute_uri(group.get_absolute_url(params={"referrer": referrer}))] - body = self._get_group_body(request, group, event) + body = self._get_group_body(group, event) if body: output.extend(["", "```", body, "```"]) return "\n".join(output) - def _get_group_title(self, request: Request, group, event): + def _get_group_title(self, group, event): return event.title def is_configured(self, project) -> bool: @@ -135,8 +135,8 @@ def link_issue(self, request: Request, group, form_data, **kwargs): def get_initial_form_data(self, request: Request, group, event, **kwargs): return { - "description": self._get_group_description(request, group, event), - "title": self._get_group_title(request, group, event), + "description": self._get_group_description(group, event), + "title": self._get_group_title(group, event), } def has_auth_configured(self, **kwargs): diff --git a/src/sentry/plugins/bases/issue2.py b/src/sentry/plugins/bases/issue2.py index fb9a463d3f821e..db139a74aee817 100644 --- a/src/sentry/plugins/bases/issue2.py +++ b/src/sentry/plugins/bases/issue2.py @@ -101,7 +101,7 @@ def get_plugin_type(self): def has_project_conf(self): return True - def get_group_body(self, request: Request, group, event, **kwargs): + def get_group_body(self, group, event, **kwargs): result = [] for interface in event.interfaces.values(): output = safe_execute(interface.to_string, event) @@ -109,15 +109,15 @@ def get_group_body(self, request: Request, group, event, **kwargs): result.append(output) return "\n\n".join(result) - def get_group_description(self, request: Request, group, event): + def get_group_description(self, group, event): referrer = self.get_conf_key() + "_plugin" output = [absolute_uri(group.get_absolute_url(params={"referrer": referrer}))] - body = self.get_group_body(request, group, event) + body = self.get_group_body(group, event) if body: output.extend(["", "```", body, "```"]) return "\n".join(output) - def get_group_title(self, request: Request, group, event): + def get_group_title(self, group, event): return event.title def is_configured(self, project) -> bool: @@ -172,13 +172,13 @@ def get_new_issue_fields(self, request: Request, group, event, **kwargs): { "name": "title", "label": "Title", - "default": self.get_group_title(request, group, event), + "default": self.get_group_title(group, event), "type": "text", }, { "name": "description", "label": "Description", - "default": self.get_group_description(request, group, event), + "default": self.get_group_description(group, event), "type": "textarea", }, ] diff --git a/src/sentry_plugins/jira/plugin.py b/src/sentry_plugins/jira/plugin.py index 4561b6ec42e2b3..df164a6daab59c 100644 --- a/src/sentry_plugins/jira/plugin.py +++ b/src/sentry_plugins/jira/plugin.py @@ -60,10 +60,10 @@ def is_configured(self, project) -> bool: return False return True - def get_group_description(self, request: Request, group, event): + def get_group_description(self, group, event): # mostly the same as parent class, but change ``` to {code} output = [absolute_uri(group.get_absolute_url(params={"referrer": "jira_plugin"}))] - body = self.get_group_body(request, group, event) + body = self.get_group_body(group, event) if body: output.extend(["", "{code}", body, "{code}"]) return "\n".join(output) diff --git a/src/sentry_plugins/redmine/plugin.py b/src/sentry_plugins/redmine/plugin.py index 6a441a983685a8..d9073b9440c3fd 100644 --- a/src/sentry_plugins/redmine/plugin.py +++ b/src/sentry_plugins/redmine/plugin.py @@ -67,13 +67,13 @@ def get_new_issue_title(self, **kwargs): def get_initial_form_data(self, request: Request, group, event, **kwargs): return { - "description": self._get_group_description(request, group, event), - "title": self._get_group_title(request, group, event), + "description": self._get_group_description(group, event), + "title": self._get_group_title(group, event), } - def _get_group_description(self, request: Request, group, event): + def _get_group_description(self, group, event): output = [absolute_uri(group.get_absolute_url())] - body = self._get_group_body(request, group, event) + body = self._get_group_body(group, event) if body: output.extend(["", "
", body, "
"]) return "\n".join(output)