fix(demo-mode): add sentry context to sync artifact bundles (#87568)

Author: obostjancic

src/sentry/demo_mode/tasks.py

@@ -142,9 +142,14 @@ def _sync_release_artifact_bundle(
 
 
 def _find_matching_project(project_id, organization_id):
-    source_project = Project.objects.get(id=project_id)
-
-    return Project.objects.get(
-        organization_id=organization_id,
-        slug=source_project.slug,
-    )
+    try:
+        source_project = Project.objects.get(id=project_id)
+
+        return Project.objects.get(
+            organization_id=organization_id,
+            slug=source_project.slug,
+        )
+    except Project.DoesNotExist:
+        sentry_sdk.set_context("project_id", project_id)
+        sentry_sdk.set_context("organization_id", organization_id)
+        raise

tests/sentry/demo_mode/test_tasks.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
+from unittest import mock
 
-import pytest
+from django.db.utils import IntegrityError
 from django.utils import timezone
 
 from sentry.demo_mode.tasks import _sync_artifact_bundles
@@ -135,11 +136,11 @@ def test_sync_release_artifact_bundles(self):
         assert target_release_bundle.release_name == source_release_bundle.release_name
         assert target_release_bundle.organization_id == self.target_org.id
 
-    def test_sync_artifact_bunles_rolls_back_on_error(self):
-        self.set_up_artifact_bundle(self.source_org, self.source_proj_bar)
+    @mock.patch("sentry.demo_mode.tasks._sync_release_artifact_bundle", side_effect=IntegrityError)
+    def test_sync_artifact_bundles_rolls_back_on_error(self, _):
+        self.set_up_artifact_bundle(self.source_org, self.source_proj_foo)
 
-        with pytest.raises(Project.DoesNotExist):
-            _sync_artifact_bundles(source_org=self.source_org, target_org=self.target_org)
+        _sync_artifact_bundles(source_org=self.source_org, target_org=self.target_org)
 
         assert not ArtifactBundle.objects.filter(organization_id=self.target_org.id).exists()
         assert not ProjectArtifactBundle.objects.filter(organization_id=self.target_org.id).exists()