Skip to content

ref(py): Normalize deletions load_defaults imports #89440

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 14, 2025
Merged

ref(py): Normalize deletions load_defaults imports #89440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 34 additions & 45 deletions src/sentry/deletions/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,47 +91,28 @@

def load_defaults(manager: DeletionTaskManager) -> None:
from sentry import models
from sentry.deletions.base import BulkModelDeletionTask
from sentry.discover.models import DiscoverSavedQuery, DiscoverSavedQueryProject
from sentry.incidents.models.alert_rule import (
AlertRule,
AlertRuleTrigger,
AlertRuleTriggerAction,
)
from sentry.incidents.models.incident import Incident
from sentry.integrations.models.organization_integration import OrganizationIntegration
from sentry.integrations.models.repository_project_path_config import (
RepositoryProjectPathConfig,
)
from sentry.models.commitfilechange import CommitFileChange
from sentry.models.rulefirehistory import RuleFireHistory
from sentry.monitors import models as monitor_models
from sentry.sentry_apps.models.platformexternalissue import PlatformExternalIssue
from sentry.sentry_apps.models.sentry_app import SentryApp
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
from sentry.sentry_apps.models.servicehook import ServiceHook
from sentry.snuba import models as snuba_models
from sentry.workflow_engine.models import DataSource, Detector, Workflow
from sentry.discover import models as discover
from sentry.incidents import models as incidents
from sentry.integrations import models as integrations
from sentry.monitors import models as monitors
from sentry.sentry_apps import models as sentry_apps
from sentry.snuba import models as snuba
from sentry.workflow_engine import models as workflow_engine

from . import defaults
from .base import BulkModelDeletionTask

# fmt: off
manager.register(models.Activity, BulkModelDeletionTask)
manager.register(AlertRule, defaults.AlertRuleDeletionTask)
manager.register(AlertRuleTrigger, defaults.AlertRuleTriggerDeletionTask)
manager.register(AlertRuleTriggerAction, defaults.AlertRuleTriggerActionDeletionTask)
manager.register(models.ApiApplication, defaults.ApiApplicationDeletionTask)
manager.register(models.ApiGrant, BulkModelDeletionTask)
manager.register(models.ApiKey, BulkModelDeletionTask)
manager.register(models.ApiToken, BulkModelDeletionTask)
manager.register(models.ArtifactBundle, defaults.ArtifactBundleDeletionTask)
manager.register(models.Commit, defaults.CommitDeletionTask)
manager.register(models.CommitAuthor, defaults.CommitAuthorDeletionTask)
manager.register(CommitFileChange, BulkModelDeletionTask)
manager.register(Detector, defaults.DetectorDeletionTask)
manager.register(DataSource, defaults.DataSourceDeletionTask)
manager.register(models.CommitFileChange, BulkModelDeletionTask)
manager.register(models.Deploy, BulkModelDeletionTask)
manager.register(DiscoverSavedQuery, defaults.DiscoverSavedQueryDeletionTask)
manager.register(DiscoverSavedQueryProject, BulkModelDeletionTask)
manager.register(models.Distribution, BulkModelDeletionTask)
manager.register(models.EnvironmentProject, BulkModelDeletionTask)
manager.register(models.Group, defaults.GroupDeletionTask)
Expand All @@ -153,38 +134,46 @@ def load_defaults(manager: DeletionTaskManager) -> None:
manager.register(models.GroupShare, BulkModelDeletionTask)
manager.register(models.GroupSnooze, BulkModelDeletionTask)
manager.register(models.GroupSubscription, BulkModelDeletionTask)
manager.register(Incident, defaults.IncidentDeletionTask)
manager.register(monitor_models.Monitor, defaults.MonitorDeletionTask)
manager.register(monitor_models.MonitorEnvironment, defaults.MonitorEnvironmentDeletionTask)
manager.register(models.Organization, defaults.OrganizationDeletionTask)
manager.register(OrganizationIntegration, defaults.OrganizationIntegrationDeletionTask)
manager.register(models.OrganizationMember, defaults.OrganizationMemberDeletionTask)
manager.register(models.OrganizationMemberTeam, BulkModelDeletionTask)
manager.register(PlatformExternalIssue, defaults.PlatformExternalIssueDeletionTask)
manager.register(models.Project, defaults.ProjectDeletionTask)
manager.register(models.ProjectBookmark, BulkModelDeletionTask)
manager.register(models.ProjectKey, BulkModelDeletionTask)
manager.register(models.PullRequest, defaults.PullRequestDeletionTask)
manager.register(snuba_models.QuerySubscription, defaults.QuerySubscriptionDeletionTask)
manager.register(models.Release, defaults.ReleaseDeletionTask)
manager.register(models.ReleaseCommit, BulkModelDeletionTask)
manager.register(models.ReleaseEnvironment, BulkModelDeletionTask)
manager.register(models.ReleaseHeadCommit, BulkModelDeletionTask)
manager.register(models.ReleaseProject, BulkModelDeletionTask)
manager.register(models.ReleaseProjectEnvironment, BulkModelDeletionTask)
manager.register(models.Repository, defaults.RepositoryDeletionTask)
manager.register(RepositoryProjectPathConfig, defaults.RepositoryProjectPathConfigDeletionTask)
manager.register(SentryApp, defaults.SentryAppDeletionTask)
manager.register(SentryAppInstallation, defaults.SentryAppInstallationDeletionTask)
manager.register(SentryAppInstallationToken, defaults.SentryAppInstallationTokenDeletionTask)
manager.register(ServiceHook, defaults.ServiceHookDeletionTask)
manager.register(models.Rule, defaults.RuleDeletionTask)
manager.register(models.RuleFireHistory, defaults.RuleFireHistoryDeletionTask)
manager.register(models.SavedSearch, BulkModelDeletionTask)
manager.register(models.Team, defaults.TeamDeletionTask)
manager.register(models.UserReport, BulkModelDeletionTask)
manager.register(models.ArtifactBundle, defaults.ArtifactBundleDeletionTask)
manager.register(models.Rule, defaults.RuleDeletionTask)
manager.register(RuleFireHistory, defaults.RuleFireHistoryDeletionTask)
manager.register(Workflow, defaults.WorkflowDeletionTask)

manager.register(discover.DiscoverSavedQuery, defaults.DiscoverSavedQueryDeletionTask)
manager.register(discover.DiscoverSavedQueryProject, BulkModelDeletionTask)
manager.register(incidents.AlertRule, defaults.AlertRuleDeletionTask)
manager.register(incidents.AlertRuleTrigger, defaults.AlertRuleTriggerDeletionTask)
manager.register(incidents.AlertRuleTriggerAction, defaults.AlertRuleTriggerActionDeletionTask)
manager.register(incidents.Incident, defaults.IncidentDeletionTask)
manager.register(integrations.OrganizationIntegration, defaults.OrganizationIntegrationDeletionTask)
manager.register(integrations.RepositoryProjectPathConfig, defaults.RepositoryProjectPathConfigDeletionTask)
manager.register(monitors.Monitor, defaults.MonitorDeletionTask)
manager.register(monitors.MonitorEnvironment, defaults.MonitorEnvironmentDeletionTask)
manager.register(sentry_apps.PlatformExternalIssue, defaults.PlatformExternalIssueDeletionTask)
manager.register(sentry_apps.SentryApp, defaults.SentryAppDeletionTask)
manager.register(sentry_apps.SentryAppInstallation, defaults.SentryAppInstallationDeletionTask)
manager.register(sentry_apps.SentryAppInstallationToken, defaults.SentryAppInstallationTokenDeletionTask)
manager.register(sentry_apps.ServiceHook, defaults.ServiceHookDeletionTask)
manager.register(snuba.QuerySubscription, defaults.QuerySubscriptionDeletionTask)
manager.register(workflow_engine.DataSource, defaults.DataSourceDeletionTask)
manager.register(workflow_engine.Detector, defaults.DetectorDeletionTask)
manager.register(workflow_engine.Workflow, defaults.WorkflowDeletionTask)
# fmt: on


_default_manager = None
Expand Down
10 changes: 10 additions & 0 deletions src/sentry/incidents/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
__all__ = (
"AlertRule",
"AlertRuleActivity",
"AlertRuleTrigger",
"AlertRuleTriggerAction",
"Incident",
)

from .alert_rule import AlertRule, AlertRuleActivity, AlertRuleTrigger, AlertRuleTriggerAction
from .incident import Incident
Comment on lines +1 to +10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these import changes? Seems a bit unnecessary, especially since these are going away

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to keep the way deletion models are imported consistent

Loading