Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref: reset_options only supports project #72815

Merged
merged 1 commit into from
Jun 17, 2024
Merged
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
4 changes: 2 additions & 2 deletions src/sentry/plugins/base/v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
4 changes: 2 additions & 2 deletions src/sentry/plugins/base/v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
9 changes: 2 additions & 7 deletions src/sentry/plugins/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/sentry_plugins/sessionstack/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading