Merge branch 'master' into athena/add-scoping-org-to-all

Author: sentaur-athena

fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/__init__.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    allow_run_sql = False
+
+    operations = [migrations.RunSQL("select 1;")]

fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/0001_initial.py

@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)

fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/__init__.py

@@ -0,0 +1,55 @@
+from django.db import migrations, models
+
+from sentry.db.models import FlexibleForeignKey
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+    checked = False
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="OtherTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="M2MTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                (
+                    "alert_rule",
+                    FlexibleForeignKey(
+                        on_delete=models.deletion.CASCADE,
+                        to="good_flow_delete_field_pending_with_not_null_m2m_app.othertable",
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                (
+                    "excluded_projects",
+                    models.ManyToManyField(
+                        through="good_flow_delete_field_pending_with_not_null_m2m_app.M2MTable",
+                        to="good_flow_delete_field_pending_with_not_null_m2m_app.othertable",
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="m2mtable",
+            name="test_table",
+            field=FlexibleForeignKey(
+                on_delete=models.deletion.CASCADE,
+                to="good_flow_delete_field_pending_with_not_null_m2m_app.testtable",
+            ),
+        ),
+    ]

fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/models.py

@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_pending_with_not_null_m2m_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="excluded_projects",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]

fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/__init__.py

@@ -0,0 +1,18 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class OtherTable(models.Model):
+    pass
+
+
+class M2MTable(models.Model):
+    alert_rule = FlexibleForeignKey(OtherTable)
+    test_table = FlexibleForeignKey(
+        "good_flow_delete_field_pending_with_not_null_m2m_app.TestTable"
+    )
+
+
+class TestTable(models.Model):
+    excluded_projects = models.ManyToManyField(OtherTable, through=M2MTable)

fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0001_initial.py

@@ -1,8 +1,7 @@
 # Generated by Django 3.1 on 2019-09-22 21:47
-
-from django.db import migrations
-
 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):
@@ -12,11 +11,5 @@ class Migration(CheckedMigration):
     ]
 
     operations = [
-        migrations.SeparateDatabaseAndState(
-            state_operations=[
-                migrations.DeleteModel(
-                    name="TestTable",
-                ),
-            ]
-        )
+        SafeDeleteModel(name="TestTable", deletion_action=DeletionAction.MOVE_TO_PENDING),
     ]

fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0002_delete_without_pending.py

@@ -1,16 +1,15 @@
 # Generated by Django 3.1 on 2019-09-22 21:47
-
-from django.db import migrations
-
 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):
 
     dependencies = [
-        ("good_flow_delete_model_state_app", "0001_initial"),
+        ("good_flow_delete_model_state_app", "0002_delete_model_state"),
     ]
 
     operations = [
-        migrations.RunSQL('DROP TABLE "good_flow_delete_model_state_app_testtable";'),
+        SafeDeleteModel(name="TestTable", deletion_action=DeletionAction.DELETE),
     ]

fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/__init__.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    allow_run_sql = True
+
+    operations = [migrations.RunSQL("select 1;")]

fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/models.py

@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)

fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0002_delete_model_state.py

@@ -337,6 +337,7 @@
 from sentry.users.api.endpoints.user_roles import UserUserRolesEndpoint
 from sentry.users.api.endpoints.userroles_details import UserRoleDetailsEndpoint
 from sentry.users.api.endpoints.userroles_index import UserRolesEndpoint
+from sentry.workflow_engine.endpoints import urls as workflow_urls
 
 from .endpoints.accept_organization_invite import AcceptOrganizationInvite
 from .endpoints.accept_project_transfer import AcceptProjectTransferEndpoint
@@ -2794,6 +2795,7 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         ProjectUptimeAlertIndexEndpoint.as_view(),
         name="sentry-api-0-project-uptime-alert-index",
     ),
+    *workflow_urls.urlpatterns,
 ]
 
 TEAM_URLS = [

fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0003_delete_table.py

@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("hybridcloud", "0002_add_slug_reservation_replica_model"),
     ]

fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/__init__.py

@@ -203,9 +203,9 @@ def process_event(
         else:
             with metrics.timer("ingest_consumer._store_event"):
                 cache_key = processing_store.store(data)
-            if data.get("type") == "transaction":
+            if consumer_type == ConsumerType.Transactions:
                 track_sampled_event(
-                    data["event_id"], "transaction", TransactionStageStatus.REDIS_PUT
+                    data["event_id"], ConsumerType.Transactions, TransactionStageStatus.REDIS_PUT
                 )
 
             save_attachments(attachments, cache_key)

fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/0001_initial.py

@@ -1,4 +1,7 @@
-class ConsumerType:
+from enum import StrEnum
+
+
+class ConsumerType(StrEnum):
     """
     Defines the types of ingestion consumers
     """

fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/__init__.py

@@ -38,7 +38,7 @@ def send_incident_alert_notification(
         # We can't send a message if we don't know the channel
         logger.warning(
             "discord.metric_alert.no_channel",
-            extra={"guild_id": incident.identifier},
+            extra={"incident_id": incident.id},
         )
         return False
 
@@ -56,7 +56,7 @@ def send_incident_alert_notification(
     except Exception as error:
         logger.warning(
             "discord.metric_alert.message_send_failure",
-            extra={"error": error, "guild_id": incident.identifier, "channel_id": channel},
+            extra={"error": error, "incident_id": incident.id, "channel_id": channel},
         )
         return False
     else:

fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/models.py

@@ -54,6 +54,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     replaces = [
         ("sentry", "0001_squashed_0200_release_indices"),
         ("sentry", "0201_semver_package"),

src/sentry/api/urls.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0489_index_checkin_timeout"),
     ]

src/sentry/hybridcloud/migrations/0003_add_scopes_to_api_key_replica.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0490_add_is_test_to_org"),
     ]

src/sentry/ingest/consumer/processors.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0504_add_artifact_bundle_index"),
     ]

src/sentry/ingest/types.py

@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0525_add_next_checkin_latest"),
     ]

src/sentry/integrations/discord/actions/metric_alert.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0534_add_notification_uuid_to_rule_fire_history"),
     ]

src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0543_add_team_id_to_groupsubscription"),
     ]

src/sentry/migrations/0490_add_is_test_to_org.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0544_remove_groupsubscription_columns"),
     ]

src/sentry/migrations/0491_remove_orgmemmap_unique_constraints.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0547_add_commitfilechange_language_column"),
     ]

src/sentry/migrations/0505_debugfile_date_accessed.py

@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = True
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0548_add_is_unclaimed_boolean_to_user"),
     ]

src/sentry/migrations/0526_pr_comment_type_column.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0555_set_neglectedrule_email_date_columns_nullable"),
     ]

src/sentry/migrations/0535_add_created_date_to_outbox_model.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0563_commitfilechange_drop_language_column"),
     ]

src/sentry/migrations/0544_remove_groupsubscription_columns.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0569_dashboard_widgets_indicator"),
     ]

src/sentry/migrations/0545_add_last_verified_auth_ident_replica.py

@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0582_add_status_indexes_checkins"),
     ]

src/sentry/migrations/0548_add_is_unclaimed_boolean_to_user.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0589_add_commit_date_added_indices"),
     ]

src/sentry/migrations/0549_re_add_groupsubscription_columns.py

@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0590_add_metadata_to_sentry_app"),
     ]