diff --git a/src/sentry/plugins/base/v1.py b/src/sentry/plugins/base/v1.py index a4e1191f41aecc..df4a4cac43bbad 100644 --- a/src/sentry/plugins/base/v1.py +++ b/src/sentry/plugins/base/v1.py @@ -507,13 +507,7 @@ def get_url_module(self): def view_configure(self, request, project, **kwargs): if request.method == "GET": - return Response( - self.get_configure_plugin_fields( - request=request, # DEPRECATED: this param should not be used - project=project, - **kwargs, - ) - ) + return Response(self.get_configure_plugin_fields(project=project, **kwargs)) self.configure(project, request.data) return Response({"message": "Successfully updated configuration."}) diff --git a/src/sentry/plugins/bases/issue2.py b/src/sentry/plugins/bases/issue2.py index 3b32ac37c90587..c2d41901aebaf7 100644 --- a/src/sentry/plugins/bases/issue2.py +++ b/src/sentry/plugins/bases/issue2.py @@ -392,9 +392,6 @@ def plugin_issues(self, request: Request, group, plugin_issues, **kwargs) -> Non def get_config(self, *args, **kwargs): # TODO(dcramer): update existing plugins to just use get_config - # TODO(dcramer): remove request kwarg after sentry-plugins has been - # updated - kwargs.setdefault("request", None) return self.get_configure_plugin_fields(*args, **kwargs) def check_config_and_auth(self, request: Request, group): diff --git a/src/sentry_plugins/bitbucket/plugin.py b/src/sentry_plugins/bitbucket/plugin.py index 85c7c062f3cacc..d1db1be56b92ba 100644 --- a/src/sentry_plugins/bitbucket/plugin.py +++ b/src/sentry_plugins/bitbucket/plugin.py @@ -190,7 +190,7 @@ def view_autocomplete(self, request: Request, group, **kwargs): return Response({field: issues}) - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): return [ { "name": "repo", diff --git a/src/sentry_plugins/github/plugin.py b/src/sentry_plugins/github/plugin.py index 9967434ca1e28b..9c948fe1922751 100644 --- a/src/sentry_plugins/github/plugin.py +++ b/src/sentry_plugins/github/plugin.py @@ -225,7 +225,7 @@ def view_autocomplete(self, request: Request, group, **kwargs): return Response({field: issues}) - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): return [ { "name": "repo", diff --git a/src/sentry_plugins/gitlab/plugin.py b/src/sentry_plugins/gitlab/plugin.py index b134d211b9f971..6c07bfd924e48c 100644 --- a/src/sentry_plugins/gitlab/plugin.py +++ b/src/sentry_plugins/gitlab/plugin.py @@ -155,7 +155,7 @@ def get_issue_url(self, group, issue_iid, **kwargs): return f"{url}/{repo}/issues/{issue_iid}" - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): gitlab_token = self.get_option("gitlab_token", project) secret_field = get_secret_field_config( gitlab_token, "Enter your GitLab API token.", include_prefix=True diff --git a/src/sentry_plugins/jira/plugin.py b/src/sentry_plugins/jira/plugin.py index e530375b040229..d13c05f847a515 100644 --- a/src/sentry_plugins/jira/plugin.py +++ b/src/sentry_plugins/jira/plugin.py @@ -524,7 +524,7 @@ def validate_config(self, project, config, actor=None): return config - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): instance = self.get_option("instance_url", project) username = self.get_option("username", project) pw = self.get_option("password", project) diff --git a/src/sentry_plugins/phabricator/plugin.py b/src/sentry_plugins/phabricator/plugin.py index 90404af8536d4f..199fdadadc1483 100644 --- a/src/sentry_plugins/phabricator/plugin.py +++ b/src/sentry_plugins/phabricator/plugin.py @@ -72,7 +72,7 @@ def get_api(self, project): token=self.get_option("token", project), ) - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): token = self.get_option("token", project) helptext = "You may generate a Conduit API Token from your account settings in Phabricator." secret_field = get_secret_field_config(token, helptext, include_prefix=True) diff --git a/src/sentry_plugins/pivotal/plugin.py b/src/sentry_plugins/pivotal/plugin.py index 1a690136c8bfa0..cdeff68749d4ae 100644 --- a/src/sentry_plugins/pivotal/plugin.py +++ b/src/sentry_plugins/pivotal/plugin.py @@ -187,7 +187,7 @@ def get_issue_title_by_id(self, request: Request, group, issue_id): json_resp = json.loads(body) return json_resp["name"] - def get_configure_plugin_fields(self, request: Request, project, **kwargs): + def get_configure_plugin_fields(self, project, **kwargs): token = self.get_option("token", project) helptext = ( "Enter your API Token (found on "