Skip to content

chore(eco): allow deleting disabled org integrations #103785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2025
+15 −1
Merged

chore(eco): allow deleting disabled org integrations #103785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f88f51
allow deleting disabled org integrations
cathteng Nov 20, 2025
1edcb87
query for active or disabled
cathteng Nov 20, 2025
16476a3
fix test
cathteng Nov 20, 2025
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
4 changes: 1 addition & 3 deletions src/sentry/integrations/api/endpoints/organization_integration_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ def delete(

with transaction.atomic(using=router.db_for_write(OrganizationIntegration)):
updated = False
for oi in OrganizationIntegration.objects.filter(
id=org_integration.id, status=ObjectStatus.ACTIVE
):
for oi in OrganizationIntegration.objects.filter(id=org_integration.id):
oi.update(status=ObjectStatus.PENDING_DELETION)
updated = True

Expand Down
13 changes: 13 additions & 0 deletions tests/sentry/integrations/api/endpoints/test_organization_integration_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import responses

from sentry import audit_log
from sentry.constants import ObjectStatus
from sentry.deletions.models.scheduleddeletion import ScheduledDeletion
from sentry.integrations.base import IntegrationInstallation
from sentry.integrations.models.integration import Integration
Expand Down Expand Up @@ -106,6 +107,18 @@ def test_removal(self) -> None:
model_name="OrganizationIntegration", object_id=org_integration.id
)

def test_delete_disabled_integration(self) -> None:
self.integration.update(status=ObjectStatus.DISABLED)
self.get_success_response(self.organization.slug, self.integration.id)
assert Integration.objects.filter(id=self.integration.id).exists()

org_integration = OrganizationIntegration.objects.get(
integration=self.integration, organization_id=self.organization.id
)
assert ScheduledDeletion.objects.filter(
model_name="OrganizationIntegration", object_id=org_integration.id
)


@control_silo_test
class IssueOrganizationIntegrationDetailsGetTest(APITestCase):
Expand Down
Loading