From 43c91daf3dc192925ce8a7ba9c5ee33dd4a417c1 Mon Sep 17 00:00:00 2001 From: anthony sottile Date: Fri, 14 Jun 2024 16:22:49 -0400 Subject: [PATCH] ref: reset_options only supports project --- src/sentry/plugins/base/v1.py | 4 ++-- src/sentry/plugins/base/v2.py | 4 ++-- src/sentry/plugins/helpers.py | 9 ++------- src/sentry_plugins/sessionstack/plugin.py | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/sentry/plugins/base/v1.py b/src/sentry/plugins/base/v1.py index 073eaf458b4160..9487bdd0f30c0b 100644 --- a/src/sentry/plugins/base/v1.py +++ b/src/sentry/plugins/base/v1.py @@ -117,10 +117,10 @@ def is_enabled(self, project: Project | RpcProject | None = None): return True - def reset_options(self, project=None, user=None): + def reset_options(self, project=None): from sentry.plugins.helpers import reset_options - return reset_options(self.get_conf_key(), project, user) + return reset_options(self.get_conf_key(), project) def get_option(self, key, project=None, user=None): """ diff --git a/src/sentry/plugins/base/v2.py b/src/sentry/plugins/base/v2.py index 3b2df6bc59a2f3..7b1f2349252f46 100644 --- a/src/sentry/plugins/base/v2.py +++ b/src/sentry/plugins/base/v2.py @@ -119,10 +119,10 @@ def is_hidden(self): """ return self.slug in HIDDEN_PLUGINS - def reset_options(self, project=None, user=None): + def reset_options(self, project=None): from sentry.plugins.helpers import reset_options - return reset_options(self.get_conf_key(), project, user) + return reset_options(self.get_conf_key(), project) def get_option(self, key, project=None, user=None): """ diff --git a/src/sentry/plugins/helpers.py b/src/sentry/plugins/helpers.py index 42b7b958190cfc..7a4c902434159a 100644 --- a/src/sentry/plugins/helpers.py +++ b/src/sentry/plugins/helpers.py @@ -9,13 +9,8 @@ __all__ = ("set_option", "get_option", "unset_option") -def reset_options(prefix, project=None, user=None): - if user: - UserOption.objects.filter( - key__startswith=f"{prefix}:", project_id=project.id if project else None, user=user - ).delete() - UserOption.objects.clear_cache() - elif project: +def reset_options(prefix, project=None): + if project: ProjectOption.objects.filter(key__startswith=f"{prefix}:", project=project).delete() ProjectOption.objects.clear_local_cache() else: diff --git a/src/sentry_plugins/sessionstack/plugin.py b/src/sentry_plugins/sessionstack/plugin.py index d634f8af9465f6..6b00a3062d7783 100644 --- a/src/sentry_plugins/sessionstack/plugin.py +++ b/src/sentry_plugins/sessionstack/plugin.py @@ -59,7 +59,7 @@ def has_project_conf(self): def get_custom_contexts(self): return [SessionStackContextType] - def reset_options(self, project=None, user=None): + def reset_options(self, project=None): self.disable(project) self.set_option("account_email", "", project)