Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions src/sentry/options/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -3174,13 +3174,6 @@
flags=FLAG_AUTOMATOR_MODIFIABLE,
)

register(
"workflow_engine.sentry-app-actions-outbox",
type=Bool,
default=False,
flags=FLAG_AUTOMATOR_MODIFIABLE,
)

register(
"workflow_engine.num_cohorts",
type=Int,
Expand Down
47 changes: 13 additions & 34 deletions src/sentry/receivers/outbox/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

from django.dispatch import receiver

from sentry import options
from sentry.constants import ObjectStatus
from sentry.hybridcloud.outbox.category import OutboxCategory
from sentry.hybridcloud.outbox.signals import process_control_outbox
Expand Down Expand Up @@ -65,27 +64,17 @@ def process_sentry_app_deletes(
payload: Mapping[str, Any],
**kwds: Any,
):
# This function should only be used when the sentry app is being deleted.
# Currently this receiver is only used for deletion.
if options.get("workflow_engine.sentry-app-actions-outbox"):
logger.info(
"sentry_app_update.update_action_status",
extra={
"region_name": region_name,
"sentry_app_id": object_identifier,
},
)
action_service.update_action_status_for_sentry_app_via_sentry_app_id(
action_service.update_action_status_for_sentry_app_via_sentry_app_id(
region_name=region_name,
status=ObjectStatus.DISABLED,
sentry_app_id=object_identifier,
)

This comment was marked as outdated.

if slug := payload.get("slug"):
action_service.update_action_status_for_webhook_via_sentry_app_slug(
region_name=region_name,
status=ObjectStatus.DISABLED,
sentry_app_id=object_identifier,
sentry_app_slug=slug,
)
if slug := payload.get("slug"):
action_service.update_action_status_for_webhook_via_sentry_app_slug(
region_name=region_name,
status=ObjectStatus.DISABLED,
sentry_app_slug=slug,
)


@receiver(process_control_outbox, sender=OutboxCategory.SENTRY_APP_INSTALLATION_DELETE)
Expand All @@ -96,21 +85,11 @@ def process_sentry_app_installation_deletes(
payload: Mapping[str, Any],
**kwds: Any,
):
# This function should only be used when the sentry app is being deleted.
# Currently this receiver is only used for deletion.
if options.get("workflow_engine.sentry-app-actions-outbox"):
logger.info(
"sentry_app_installation_delete.update_action_status",
extra={
"region_name": region_name,
"sentry_app_install_uuid": payload["uuid"],
},
)
action_service.update_action_status_for_sentry_app_via_uuid__region(
region_name=region_name,
status=ObjectStatus.DISABLED,
sentry_app_install_uuid=payload["uuid"],
)
action_service.update_action_status_for_sentry_app_via_uuid__region(
region_name=region_name,
status=ObjectStatus.DISABLED,
sentry_app_install_uuid=payload["uuid"],
)


@receiver(process_control_outbox, sender=OutboxCategory.API_APPLICATION_UPDATE)
Expand Down
2 changes: 0 additions & 2 deletions tests/sentry/deletions/test_sentry_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from sentry.sentry_apps.models.sentry_app import SentryApp
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
from sentry.testutils.cases import TestCase
from sentry.testutils.helpers.options import override_options
from sentry.testutils.silo import control_silo_test, create_test_regions
from sentry.users.models.user import User
from sentry.workflow_engine.models import Action
Expand Down Expand Up @@ -60,7 +59,6 @@ def test_soft_deletes_sentry_app(self) -> None:

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

@override_options({"workflow_engine.sentry-app-actions-outbox": True})
def test_disables_actions(self) -> None:
action = self.create_action(
type=Action.Type.SENTRY_APP,
Expand Down
2 changes: 0 additions & 2 deletions tests/sentry/deletions/test_sentry_app_installations.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from sentry.silo.base import SiloMode
from sentry.silo.safety import unguarded_write
from sentry.testutils.cases import TestCase
from sentry.testutils.helpers.options import override_options
from sentry.testutils.outbox import outbox_runner
from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
from sentry.workflow_engine.models import Action
Expand Down Expand Up @@ -112,7 +111,6 @@ def test_soft_deletes_installation(self) -> None:

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

@override_options({"workflow_engine.sentry-app-actions-outbox": True})
def test_disables_actions(self) -> None:
action = self.create_action(
type=Action.Type.SENTRY_APP,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from sentry.sentry_apps.token_exchange.grant_exchanger import GrantExchanger
from sentry.testutils.cases import APITestCase
from sentry.testutils.helpers.analytics import assert_last_analytics_event
from sentry.testutils.helpers.options import override_options
from sentry.testutils.outbox import outbox_runner
from sentry.testutils.silo import control_silo_test
from sentry.users.services.user.service import user_service
Expand Down Expand Up @@ -108,7 +107,6 @@ def test_no_access_outside_install_organization(self) -> None:
class DeleteSentryAppInstallationDetailsTest(SentryAppInstallationDetailsTest):
@responses.activate
@patch("sentry.analytics.record")
@override_options({"workflow_engine.sentry-app-actions-outbox": True})
def test_delete_install(self, record: MagicMock) -> None:
responses.add(url="https://example.com/webhook", method=responses.POST, body=b"")
self.login_as(user=self.user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,6 @@ def test_cannot_delete_by_manager(self) -> None:

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

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