Skip to content

Commit 039abb0

Browse files
authored
chore(eco): remove sentry app outbox flag (#101746)
1 parent bb343da commit 039abb0

File tree

6 files changed

+13
-48
lines changed

6 files changed

+13
-48
lines changed

src/sentry/options/defaults.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,13 +3189,6 @@
31893189
flags=FLAG_AUTOMATOR_MODIFIABLE,
31903190
)
31913191

3192-
register(
3193-
"workflow_engine.sentry-app-actions-outbox",
3194-
type=Bool,
3195-
default=False,
3196-
flags=FLAG_AUTOMATOR_MODIFIABLE,
3197-
)
3198-
31993192
register(
32003193
"workflow_engine.num_cohorts",
32013194
type=Int,

src/sentry/receivers/outbox/control.py

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from django.dispatch import receiver
1616

17-
from sentry import options
1817
from sentry.constants import ObjectStatus
1918
from sentry.hybridcloud.outbox.category import OutboxCategory
2019
from sentry.hybridcloud.outbox.signals import process_control_outbox
@@ -65,27 +64,17 @@ def process_sentry_app_deletes(
6564
payload: Mapping[str, Any],
6665
**kwds: Any,
6766
):
68-
# This function should only be used when the sentry app is being deleted.
69-
# Currently this receiver is only used for deletion.
70-
if options.get("workflow_engine.sentry-app-actions-outbox"):
71-
logger.info(
72-
"sentry_app_update.update_action_status",
73-
extra={
74-
"region_name": region_name,
75-
"sentry_app_id": object_identifier,
76-
},
77-
)
78-
action_service.update_action_status_for_sentry_app_via_sentry_app_id(
67+
action_service.update_action_status_for_sentry_app_via_sentry_app_id(
68+
region_name=region_name,
69+
status=ObjectStatus.DISABLED,
70+
sentry_app_id=object_identifier,
71+
)
72+
if slug := payload.get("slug"):
73+
action_service.update_action_status_for_webhook_via_sentry_app_slug(
7974
region_name=region_name,
8075
status=ObjectStatus.DISABLED,
81-
sentry_app_id=object_identifier,
76+
sentry_app_slug=slug,
8277
)
83-
if slug := payload.get("slug"):
84-
action_service.update_action_status_for_webhook_via_sentry_app_slug(
85-
region_name=region_name,
86-
status=ObjectStatus.DISABLED,
87-
sentry_app_slug=slug,
88-
)
8978

9079

9180
@receiver(process_control_outbox, sender=OutboxCategory.SENTRY_APP_INSTALLATION_DELETE)
@@ -96,21 +85,11 @@ def process_sentry_app_installation_deletes(
9685
payload: Mapping[str, Any],
9786
**kwds: Any,
9887
):
99-
# This function should only be used when the sentry app is being deleted.
100-
# Currently this receiver is only used for deletion.
101-
if options.get("workflow_engine.sentry-app-actions-outbox"):
102-
logger.info(
103-
"sentry_app_installation_delete.update_action_status",
104-
extra={
105-
"region_name": region_name,
106-
"sentry_app_install_uuid": payload["uuid"],
107-
},
108-
)
109-
action_service.update_action_status_for_sentry_app_via_uuid__region(
110-
region_name=region_name,
111-
status=ObjectStatus.DISABLED,
112-
sentry_app_install_uuid=payload["uuid"],
113-
)
88+
action_service.update_action_status_for_sentry_app_via_uuid__region(
89+
region_name=region_name,
90+
status=ObjectStatus.DISABLED,
91+
sentry_app_install_uuid=payload["uuid"],
92+
)
11493

11594

11695
@receiver(process_control_outbox, sender=OutboxCategory.API_APPLICATION_UPDATE)

tests/sentry/deletions/test_sentry_app.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from sentry.sentry_apps.models.sentry_app import SentryApp
99
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
1010
from sentry.testutils.cases import TestCase
11-
from sentry.testutils.helpers.options import override_options
1211
from sentry.testutils.silo import control_silo_test, create_test_regions
1312
from sentry.users.models.user import User
1413
from sentry.workflow_engine.models import Action
@@ -60,7 +59,6 @@ def test_soft_deletes_sentry_app(self) -> None:
6059

6160
assert c.fetchone()[0] == 1
6261

63-
@override_options({"workflow_engine.sentry-app-actions-outbox": True})
6462
def test_disables_actions(self) -> None:
6563
action = self.create_action(
6664
type=Action.Type.SENTRY_APP,

tests/sentry/deletions/test_sentry_app_installations.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from sentry.silo.base import SiloMode
1818
from sentry.silo.safety import unguarded_write
1919
from sentry.testutils.cases import TestCase
20-
from sentry.testutils.helpers.options import override_options
2120
from sentry.testutils.outbox import outbox_runner
2221
from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
2322
from sentry.workflow_engine.models import Action
@@ -112,7 +111,6 @@ def test_soft_deletes_installation(self) -> None:
112111

113112
assert c.fetchone()[0] == 1
114113

115-
@override_options({"workflow_engine.sentry-app-actions-outbox": True})
116114
def test_disables_actions(self) -> None:
117115
action = self.create_action(
118116
type=Action.Type.SENTRY_APP,

tests/sentry/sentry_apps/api/endpoints/test_organization_sentry_app_installation_details.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from sentry.sentry_apps.token_exchange.grant_exchanger import GrantExchanger
1717
from sentry.testutils.cases import APITestCase
1818
from sentry.testutils.helpers.analytics import assert_last_analytics_event
19-
from sentry.testutils.helpers.options import override_options
2019
from sentry.testutils.outbox import outbox_runner
2120
from sentry.testutils.silo import control_silo_test
2221
from sentry.users.services.user.service import user_service
@@ -108,7 +107,6 @@ def test_no_access_outside_install_organization(self) -> None:
108107
class DeleteSentryAppInstallationDetailsTest(SentryAppInstallationDetailsTest):
109108
@responses.activate
110109
@patch("sentry.analytics.record")
111-
@override_options({"workflow_engine.sentry-app-actions-outbox": True})
112110
def test_delete_install(self, record: MagicMock) -> None:
113111
responses.add(url="https://example.com/webhook", method=responses.POST, body=b"")
114112
self.login_as(user=self.user)

tests/sentry/sentry_apps/api/endpoints/test_sentry_app_details.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,6 @@ def test_cannot_delete_by_manager(self) -> None:
850850

851851
self.get_error_response(self.internal_integration.slug, status_code=403)
852852

853-
@override_options({"workflow_engine.sentry-app-actions-outbox": True})
854853
def test_disables_actions(self) -> None:
855854
action = self.create_action(
856855
type=Action.Type.SENTRY_APP,

0 commit comments

Comments
 (0)