🔧 chore(data-secrecy v2): SafeDelete DataSecrecyWaiver

migrations_lockfile.txt

@@ -27,7 +27,7 @@ preprod: 0010_actual_drop_preprod_artifact_analysis_file_id_col
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0949_add_dashboard_widget_snapshot_model
+sentry: 0950_safe_del_dswaiver
 
 social_auth: 0003_social_auth_json_field
 

src/sentry/data_secrecy/models/__init__.py

@@ -1,7 +1,5 @@
 from .data_access_grant import DataAccessGrant
-from .datasecrecywaiver import DataSecrecyWaiver
 
 __all__ = [
-    "DataSecrecyWaiver",
     "DataAccessGrant",
 ]

src/sentry/migrations/0950_safe_del_dswaiver.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.2.1 on 2025-07-14 18:38
+
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.models import SafeDeleteModel
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0949_add_dashboard_widget_snapshot_model"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="DataSecrecyWaiver",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]

src/sentry/testutils/helpers/backups.py

@@ -39,7 +39,6 @@
 from sentry.backup.imports import import_in_global_scope
 from sentry.backup.scopes import ExportScope
 from sentry.backup.validate import validate
-from sentry.data_secrecy.models import DataSecrecyWaiver
 from sentry.db.models.paranoia import ParanoidModel
 from sentry.explore.models import (
     ExploreSavedQuery,
@@ -669,13 +668,6 @@ def create_exhaustive_organization(
                 user_id=owner_id,
             )
 
-        # DataSecrecyWaiver
-        DataSecrecyWaiver.objects.create(
-            organization=org,
-            access_start=timezone.now(),
-            access_end=timezone.now() + timedelta(days=1),
-        )
-
         # Setup a test 'Issue Rule' and 'Automation'
         workflow = self.create_workflow(organization=org)
         detector = self.create_detector(project=project)

tests/sentry/db/models/test_base.py

@@ -1,6 +1,5 @@
 from unittest import TestCase
 
-from sentry.data_secrecy.models import DataSecrecyWaiver
 from sentry.db.models import DefaultFieldsModelExisting
 from sentry.integrations.models import Integration, RepositoryProjectPathConfig
 from sentry.models.groupsearchview import GroupSearchView
@@ -39,7 +38,6 @@ def test(self):
             BaseImportChunk,
             ControlImportChunk,
             ControlImportChunkReplica,
-            DataSecrecyWaiver,
             GroupSearchView,
             Integration,
             NotificationSettingBase,