From 0836c5651ce5209db8a5fcde77fc3ef34afebde4 Mon Sep 17 00:00:00 2001 From: Raj Joshi Date: Mon, 14 Jul 2025 11:40:13 -0700 Subject: [PATCH 1/4] :wrench: chore: SafeDelete DataSecrecyWaiver --- src/sentry/data_secrecy/models/__init__.py | 2 -- .../migrations/0949_safe_del_dswaiver.py | 33 +++++++++++++++++++ src/sentry/testutils/helpers/backups.py | 8 ----- 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 src/sentry/migrations/0949_safe_del_dswaiver.py diff --git a/src/sentry/data_secrecy/models/__init__.py b/src/sentry/data_secrecy/models/__init__.py index 04377f028517eb..16eb61ea680703 100644 --- a/src/sentry/data_secrecy/models/__init__.py +++ b/src/sentry/data_secrecy/models/__init__.py @@ -1,7 +1,5 @@ from .data_access_grant import DataAccessGrant -from .datasecrecywaiver import DataSecrecyWaiver __all__ = [ - "DataSecrecyWaiver", "DataAccessGrant", ] diff --git a/src/sentry/migrations/0949_safe_del_dswaiver.py b/src/sentry/migrations/0949_safe_del_dswaiver.py new file mode 100644 index 00000000000000..3cdcf8a0ca0d59 --- /dev/null +++ b/src/sentry/migrations/0949_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", "0948_ds_waiver_org_fk_not_db_constr"), + ] + + operations = [ + SafeDeleteModel( + name="DataSecrecyWaiver", + deletion_action=DeletionAction.MOVE_TO_PENDING, + ), + ] diff --git a/src/sentry/testutils/helpers/backups.py b/src/sentry/testutils/helpers/backups.py index 4022b339c18634..9873a7e3766e49 100644 --- a/src/sentry/testutils/helpers/backups.py +++ b/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) From 0d1cb2f8cf595f913ecd4ec860f4ed95a48eca87 Mon Sep 17 00:00:00 2001 From: Raj Joshi Date: Mon, 14 Jul 2025 11:41:06 -0700 Subject: [PATCH 2/4] :wrench: chore: delete model --- .../data_secrecy/models/datasecrecywaiver.py | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 src/sentry/data_secrecy/models/datasecrecywaiver.py diff --git a/src/sentry/data_secrecy/models/datasecrecywaiver.py b/src/sentry/data_secrecy/models/datasecrecywaiver.py deleted file mode 100644 index 106f8470e776f6..00000000000000 --- a/src/sentry/data_secrecy/models/datasecrecywaiver.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.contrib.postgres.fields.array import ArrayField -from django.db import models -from django.utils import timezone - -from sentry.backup.scopes import RelocationScope -from sentry.db.models import DefaultFieldsModelExisting, FlexibleForeignKey, region_silo_model - - -@region_silo_model -class DataSecrecyWaiver(DefaultFieldsModelExisting): - __relocation_scope__ = RelocationScope.Organization - - organization = FlexibleForeignKey("sentry.Organization", unique=True, db_constraint=False) - access_start = models.DateTimeField(default=timezone.now) - access_end = models.DateTimeField(default=timezone.now) - zendesk_tickets = ArrayField(models.TextField(), default=list) - - class Meta: - app_label = "sentry" - db_table = "sentry_datasecrecywaiver" From ed12987e719ad8286ce7467e9206e8f67a851b04 Mon Sep 17 00:00:00 2001 From: Raj Joshi Date: Mon, 14 Jul 2025 11:47:07 -0700 Subject: [PATCH 3/4] :test_tube: test: fix test --- tests/sentry/db/models/test_base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/sentry/db/models/test_base.py b/tests/sentry/db/models/test_base.py index 4b1532629551b7..7623d9b1977be7 100644 --- a/tests/sentry/db/models/test_base.py +++ b/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, From d1bcda9c2e7cc56999e2af22d045d2a874c37a8f Mon Sep 17 00:00:00 2001 From: Raj Joshi Date: Tue, 15 Jul 2025 09:55:18 -0700 Subject: [PATCH 4/4] :wrench: chore: bump migration --- migrations_lockfile.txt | 2 +- .../{0949_safe_del_dswaiver.py => 0950_safe_del_dswaiver.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/sentry/migrations/{0949_safe_del_dswaiver.py => 0950_safe_del_dswaiver.py} (95%) diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt index 28df4315e681a3..add1c87f81d45c 100644 --- a/migrations_lockfile.txt +++ b/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 diff --git a/src/sentry/migrations/0949_safe_del_dswaiver.py b/src/sentry/migrations/0950_safe_del_dswaiver.py similarity index 95% rename from src/sentry/migrations/0949_safe_del_dswaiver.py rename to src/sentry/migrations/0950_safe_del_dswaiver.py index 3cdcf8a0ca0d59..56d95fbfb662fb 100644 --- a/src/sentry/migrations/0949_safe_del_dswaiver.py +++ b/src/sentry/migrations/0950_safe_del_dswaiver.py @@ -22,7 +22,7 @@ class Migration(CheckedMigration): is_post_deployment = False dependencies = [ - ("sentry", "0948_ds_waiver_org_fk_not_db_constr"), + ("sentry", "0949_add_dashboard_widget_snapshot_model"), ] operations = [